Merge branch 'master' into ext-fs-irods-master

.gitignore

@@ -72,7 +72,10 @@ nbproject
 .well-known
 /.buildpath
 
-#tests - autogenerated filed
+# Tests
+/tests/phpunit.xml
+
+# Tests - auto-generated files
 data-autotest
 /tests/coverage*
 /tests/autoconfig*

apps/files/ajax/scan.php

@@ -4,6 +4,16 @@ session_write_close();
 
 $force = (isset($_GET['force']) and ($_GET['force'] === 'true'));
 $dir = isset($_GET['dir']) ? $_GET['dir'] : '';
+if (isset($_GET['users'])) {
+	OC_JSON::checkAdminUser();
+	if ($_GET['users'] === 'all') {
+		$users = OC_User::getUsers();
+	} else {
+		$users = json_decode($_GET['users']);
+	}
+} else {
+	$users = array(OC_User::getUser());
+}
 
 $eventSource = new OC_EventSource();
 ScanListener::$eventSource = $eventSource;
@@ -12,21 +22,27 @@ ScanListener::$view = \OC\Files\Filesystem::getView();
 OC_Hook::connect('\OC\Files\Cache\Scanner', 'scan_folder', 'ScanListener', 'folder');
 OC_Hook::connect('\OC\Files\Cache\Scanner', 'scan_file', 'ScanListener', 'file');
 
-$absolutePath = \OC\Files\Filesystem::getView()->getAbsolutePath($dir);
+foreach ($users as $user) {
+	$eventSource->send('user', $user);
+	OC_Util::tearDownFS();
+	OC_Util::setupFS($user);
 
-$mountPoints = \OC\Files\Filesystem::getMountPoints($absolutePath);
-$mountPoints[] = \OC\Files\Filesystem::getMountPoint($absolutePath);
-$mountPoints = array_reverse($mountPoints); //start with the mount point of $dir
+	$absolutePath = \OC\Files\Filesystem::getView()->getAbsolutePath($dir);
 
-foreach ($mountPoints as $mountPoint) {
-	$storage = \OC\Files\Filesystem::getStorage($mountPoint);
-	if ($storage) {
-		ScanListener::$mountPoints[$storage->getId()] = $mountPoint;
-		$scanner = $storage->getScanner();
-		if ($force) {
-			$scanner->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE, \OC\Files\Cache\Scanner::REUSE_ETAG);
-		} else {
-			$scanner->backgroundScan();
+	$mountPoints = \OC\Files\Filesystem::getMountPoints($absolutePath);
+	$mountPoints[] = \OC\Files\Filesystem::getMountPoint($absolutePath);
+	$mountPoints = array_reverse($mountPoints); //start with the mount point of $dir
+
+	foreach ($mountPoints as $mountPoint) {
+		$storage = \OC\Files\Filesystem::getStorage($mountPoint);
+		if ($storage) {
+			ScanListener::$mountPoints[$storage->getId()] = $mountPoint;
+			$scanner = $storage->getScanner();
+			if ($force) {
+				$scanner->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE, \OC\Files\Cache\Scanner::REUSE_ETAG);
+			} else {
+				$scanner->backgroundScan();
+			}
 		}
 	}
 }

apps/files/js/files.js

@@ -695,7 +695,7 @@ $(document).ready(function() {
 	}
 });
 
-function scanFiles(force, dir){
+function scanFiles(force, dir, users){
 	if (!OC.currentUser) {
 		return;
 	}
@@ -705,7 +705,18 @@ function scanFiles(force, dir){
 	}
 	force = !!force; //cast to bool
 	scanFiles.scanning = true;
-	var scannerEventSource = new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force:force,dir:dir});
+	var scannerEventSource;
+	if (users) {
+		var usersString;
+		if (users === 'all') {
+			usersString = users;
+		} else {
+			usersString = JSON.stringify(users);
+		}
+		scannerEventSource = new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force: force,dir: dir, users: usersString});
+	} else {
+		scannerEventSource = new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force: force,dir: dir});
+	}
 	scanFiles.cancel = scannerEventSource.close.bind(scannerEventSource);
 	scannerEventSource.listen('count',function(count){
 		console.log(count + ' files scanned')
@@ -717,6 +728,9 @@ function scanFiles(force, dir){
 		scanFiles.scanning=false;
 		console.log('done after ' + count + ' files');
 	});
+	scannerEventSource.listen('user',function(user){
+		console.log('scanning files for ' + user);
+	});
 }
 scanFiles.scanning=false;
 

apps/files/l10n/eo.php

@@ -9,9 +9,11 @@
 "No file was uploaded" => "Neniu dosiero alŝutiĝis.",
 "Missing a temporary folder" => "Mankas provizora dosierujo.",
 "Failed to write to disk" => "Malsukcesis skribo al disko",
+"Not enough storage available" => "Ne haveblas sufiĉa memoro",
 "Invalid directory." => "Nevalida dosierujo.",
 "Files" => "Dosieroj",
 "Share" => "Kunhavigi",
+"Delete permanently" => "Forigi por ĉiam",
 "Delete" => "Forigi",
 "Rename" => "Alinomigi",
 "Pending" => "Traktotaj",
@@ -21,11 +23,14 @@
 "cancel" => "nuligi",
 "replaced {new_name} with {old_name}" => "anstataŭiĝis {new_name} per {old_name}",
 "undo" => "malfari",
+"perform delete operation" => "plenumi forigan operacion",
 "1 file uploading" => "1 dosiero estas alŝutata",
 "files uploading" => "dosieroj estas alŝutataj",
 "'.' is an invalid file name." => "'.' ne estas valida dosiernomo.",
 "File name cannot be empty." => "Dosiernomo devas ne malpleni.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, “|”, “?” kaj “*” ne permesatas.",
+"Your storage is full, files can not be updated or synced anymore!" => "Via memoro plenas, ne plu eblas ĝisdatigi aŭ sinkronigi dosierojn!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Via memoro preskaŭ plenas ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Via elŝuto pretiĝatas. Ĉi tio povas daŭri iom da tempo se la dosieroj grandas.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn",
 "Not enough space available" => "Ne haveblas sufiĉa spaco",
@@ -41,6 +46,7 @@
 "{count} folders" => "{count} dosierujoj",
 "1 file" => "1 dosiero",
 "{count} files" => "{count} dosierujoj",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nevalida dosierujnomo. La uzo de “Shared” estas rezervita de ownCloud.",
 "Unable to rename file" => "Ne eblis alinomigi dosieron",
 "Upload" => "Alŝuti",
 "File handling" => "Dosieradministro",
@@ -55,12 +61,15 @@
 "Text file" => "Tekstodosiero",
 "Folder" => "Dosierujo",
 "From link" => "El ligilo",
+"Deleted files" => "Forigitaj dosieroj",
 "Cancel upload" => "Nuligi alŝuton",
+"You don’t have write permissions here." => "Vi ne havas permeson skribi ĉi tie.",
 "Nothing in here. Upload something!" => "Nenio estas ĉi tie. Alŝutu ion!",
 "Download" => "Elŝuti",
 "Unshare" => "Malkunhavigi",
 "Upload too large" => "Alŝuto tro larĝa",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo.",
 "Files are being scanned, please wait." => "Dosieroj estas skanataj, bonvolu atendi.",
-"Current scanning" => "Nuna skano"
+"Current scanning" => "Nuna skano",
+"Upgrading filesystem cache..." => "Ĝisdatiĝas dosiersistema kaŝmemoro..."
 );

apps/files/l10n/ro.php

@@ -46,6 +46,7 @@
 "{count} folders" => "{count} foldare",
 "1 file" => "1 fisier",
 "{count} files" => "{count} fisiere",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nume de dosar invalid. Utilizarea 'Shared' e rezervată de ownCloud",
 "Unable to rename file" => "Nu s-a putut redenumi fișierul",
 "Upload" => "Încărcare",
 "File handling" => "Manipulare fișiere",

apps/files/l10n/sl.php

@@ -46,6 +46,7 @@
 "{count} folders" => "{count} map",
 "1 file" => "1 datoteka",
 "{count} files" => "{count} datotek",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ime mape je neveljavno. Uporaba oznake \"Souporaba\" je rezervirana za ownCloud",
 "Unable to rename file" => "Ni mogoče preimenovati datoteke",
 "Upload" => "Pošlji",
 "File handling" => "Upravljanje z datotekami",

apps/files/triggerupdate.php

@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/../../lib/base.php';
+
+if (OC::$CLI) {
+	if (count($argv) === 2) {
+		$file = $argv[1];
+		list(, $user) = explode('/', $file);
+		OC_Util::setupFS($user);
+		$view = new \OC\Files\View('');
+		/**
+		 * @var \OC\Files\Storage\Storage $storage
+		 */
+		list($storage, $internalPath) = $view->resolvePath($file);
+		$watcher = $storage->getWatcher($internalPath);
+		$watcher->checkUpdate($internalPath);
+	} else {
+		echo "Usage: php triggerupdate.php /path/to/file\n";
+	}
+} else {
+	echo "This script can be run from the command line only\n";
+}

apps/files_encryption/appinfo/app.php

@@ -33,13 +33,18 @@ if (!OC_Config::getValue('maintenance', false)) {
 		}
 
 		$view = new OC_FilesystemView('/');
-		$session = new \OCA\Encryption\Session($view);
+
+		$sessionReady = false;
+		if(extension_loaded("openssl")) {
+			$session = new \OCA\Encryption\Session($view);
+			$sessionReady = true;
+		}
 
 		$user = \OCP\USER::getUser();
 		// check if user has a private key
-		if (
-			!$view->file_exists('/' . $user . '/files_encryption/' . $user . '.private.key')
-			&& OCA\Encryption\Crypt::mode() === 'server'
+		if ($sessionReady === false
+			|| (!$view->file_exists('/' . $user . '/files_encryption/' . $user . '.private.key')
+				&& OCA\Encryption\Crypt::mode() === 'server')
 		) {
 
 			// Force the user to log-in again if the encryption key isn't unlocked

apps/files_encryption/appinfo/info.xml

@@ -2,7 +2,7 @@
 <info>
 	<id>files_encryption</id>
 	<name>Encryption</name>
-	<description>WARNING: This is a preview release of the new ownCloud 5 encryption system. Testing and feedback is very welcome but don't use this in production yet. Encryption is not yet compatible with LDAP.</description>
+	<description>WARNING: This is a preview release of the new ownCloud 5 encryption system. Testing and feedback is very welcome but don't use this in production yet. After the app was enabled you need to re-login to initialize your encryption keys</description>
 	<licence>AGPL</licence>
 	<author>Sam Tuke, Bjoern Schiessle, Florin Peter</author>
 	<require>4</require>

apps/files_encryption/hooks/hooks.php

@@ -38,11 +38,15 @@ class Hooks {
 	 * @note This method should never be called for users using client side encryption
 	 */
 	public static function login($params) {
-
-		// Manually initialise Filesystem{} singleton with correct 
-		// fake root path, in order to avoid fatal webdav errors
-		// NOTE: disabled because this give errors on webdav!
-		//\OC\Files\Filesystem::init( $params['uid'], '/' . 'files' . '/' );
+		$l = new \OC_L10N('files_encryption');
+		//check if openssl is available
+		if(!extension_loaded("openssl") ) {
+			$error_msg = $l->t("PHP module OpenSSL is not installed.");
+			$hint = $l->t('Please ask your server administrator to install the module. For now the encryption app was disabled.');
+			\OC_App::disable('files_encryption');
+			\OCP\Util::writeLog('Encryption library', $error_msg . ' ' . $hint, \OCP\Util::ERROR);
+			\OCP\Template::printErrorPage($error_msg, $hint);
+		}
 
 		$view = new \OC_FilesystemView('/');
 

apps/files_encryption/l10n/ca.php

@@ -13,13 +13,8 @@
 "You can unlock your private key in your " => "Podeu desbloquejar la clau privada en el vostre",
 "personal settings" => "arranjament personal",
 "Encryption" => "Xifrat",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activa la clau de recuperació de contrasenya (permet compartir la clau de recuperació):",
-"Recovery account password" => "Contrasenya de recuperació del compte",
 "Enabled" => "Activat",
 "Disabled" => "Desactivat",
-"Change encryption passwords recovery key:" => "Canvia la clau de recuperació de la contrasenya:",
-"Old Recovery account password" => "Contrasenya de recuperació anterior",
-"New Recovery account password" => "Nova contrasenya de recuperació de compte",
 "Change Password" => "Canvia la contrasenya",
 "Your private key password no longer match your log-in password:" => "La clau privada ja no es correspon amb la contrasenya d'accés:",
 "Set your old private key password to your current log-in password." => "Establiu la vostra contrasenya clau en funció de la contrasenya actual d'accés.",

apps/files_encryption/l10n/cs_CZ.php

@@ -10,13 +10,8 @@
 "Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "Váš soukromý klíč není platný. Možná bylo vaše heslo změněno z venku. Můžete aktualizovat heslo soukromého klíče v osobním nastavení pro opětovné získání přístupu k souborům",
 "Saving..." => "Ukládám...",
 "Encryption" => "Šifrování",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Povolit záchranný klíč šifrovacích hesel (povolí sdílený záchranný klíč):",
-"Recovery account password" => "Heslo pro obnovu účtu",
 "Enabled" => "Povoleno",
 "Disabled" => "Zakázáno",
-"Change encryption passwords recovery key:" => "Změnit záchranný klíč šifrovacích hesel:",
-"Old Recovery account password" => "Stávající heslo pro obnovu účtu",
-"New Recovery account password" => "Nové heslo pro obnovu účtu",
 "Change Password" => "Změnit heslo",
 "Enable password recovery:" => "Povolit obnovu hesla:",
 "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Povolení vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo",

apps/files_encryption/l10n/de.php

@@ -9,10 +9,8 @@
 "Saving..." => "Speichern...",
 "personal settings" => "Private Einstellungen",
 "Encryption" => "Verschlüsselung",
-"Recovery account password" => "Password zurücksetzen",
 "Enabled" => "Aktiviert",
 "Disabled" => "Deaktiviert",
-"Change encryption passwords recovery key:" => "Wiederherstellungsschlüssel für Passwörter ändern:",
 "Change Password" => "Passwort ändern",
 "Old log-in password" => "Altes login Passwort",
 "Current log-in password" => "Aktuelles Passwort",

apps/files_encryption/l10n/de_DE.php

@@ -5,14 +5,22 @@
 "Could not disable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
 "Password successfully changed." => "Das Passwort wurde erfolgreich geändert.",
 "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.",
+"PHP module OpenSSL is not installed." => "Das PHP-Modul OpenSSL ist nicht installiert.",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Bitte fragen Sie Ihren Server-Administrator, das entsprechende Modul zu installieren. Bis dahin wurde die Anwendung zur Verschlüsselung deaktiviert.",
 "Saving..." => "Speichern...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Ihr privater Schlüssel ist ungültig! Vielleicht wurde Ihr Passwort von außerhalb geändert.",
+"personal settings" => "Persönliche Einstellungen",
 "Encryption" => "Verschlüsselung",
-"Recovery account password" => "Account-Passwort wiederherstellen",
 "Enabled" => "Aktiviert",
 "Disabled" => "Deaktiviert",
-"Old Recovery account password" => "Altes Passwort für die Account-Wiederherstellung",
-"New Recovery account password" => "Neues Passwort für die Account-Wiederherstellung",
 "Change Password" => "Passwort ändern",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
+"Old log-in password" => "Altes Login-Passwort",
+"Current log-in password" => "Momentanes Login-Passwort",
+"Update Private Key Password" => "Das Passwort des privaten Schlüssels aktualisieren",
+"Enable password recovery:" => "Passwort-Wiederherstellung aktivieren:",
 "File recovery settings updated" => "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
 "Could not update file recovery" => "Die Dateiwiederherstellung konnte nicht aktualisiert werden."
 );

apps/files_encryption/l10n/el.php

@@ -2,8 +2,8 @@
 "Password successfully changed." => "Ο κωδικός αλλάχτηκε επιτυχώς.",
 "Could not change the password. Maybe the old password was not correct." => "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός.",
 "Saving..." => "Γίνεται αποθήκευση...",
+"personal settings" => "προσωπικές ρυθμίσεις",
 "Encryption" => "Κρυπτογράφηση",
-"Recovery account password" => "Επαναφορά κωδικού πρόσβασης λογαριασμού",
 "Enabled" => "Ενεργοποιημένο",
 "Disabled" => "Απενεργοποιημένο",
 "Change Password" => "Αλλαγή Κωδικού Πρόσβασης",

apps/files_encryption/l10n/eo.php

@@ -1,4 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Password successfully changed." => "La pasvorto sukcese ŝanĝiĝis.",
+"Could not change the password. Maybe the old password was not correct." => "Ne eblis ŝanĝi la pasvorton. Eble la malnova pasvorto malĝustis.",
+"Private key password successfully updated." => "La pasvorto de la malpublika klavo sukcese ĝisdatiĝis.",
+"PHP module OpenSSL is not installed." => "La PHP-modulo OpenSSL ne instalitas.",
 "Saving..." => "Konservante...",
-"Encryption" => "Ĉifrado"
+"personal settings" => "persona agordo",
+"Encryption" => "Ĉifrado",
+"Enabled" => "Kapabligita",
+"Disabled" => "Malkapabligita",
+"Change Password" => "Ŝarĝi pasvorton",
+"Your private key password no longer match your log-in password:" => "La pasvorto de via malpublika klavo ne plu kongruas kun via ensaluta pasvorto:",
+"Old log-in password" => "Malnova ensaluta pasvorto",
+"Current log-in password" => "Nuna ensaluta pasvorto",
+"Update Private Key Password" => "Ĝisdatigi la pasvorton de la malpublika klavo"
 );

apps/files_encryption/l10n/es.php

@@ -6,16 +6,31 @@
 "Password successfully changed." => "Su contraseña ha sido cambiada",
 "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.",
+"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. Puede actualizar la contraseña de su clave privada en sus opciones personales para recuperar el acceso a sus ficheros",
+"PHP module OpenSSL is not installed." => "El módulo OpenSSL de PHP no está instalado.",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Por favor pida al administrador de su servidor que le instale el módulo. De momento la aplicación de cifrado está deshabilitada.",
 "Saving..." => "Guardando...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera.",
+"You can unlock your private key in your " => "Puede desbloquear su clave privada en su",
+"personal settings" => "opciones personales",
 "Encryption" => "Cifrado",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Habilitar clave de recuperación de contraseñas ():",
-"Recovery account password" => "Recuperar contraseña",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar la clave de recuperación (permite recuperar los ficheros del usuario en caso de pérdida de la contraseña);",
+"Recovery key password" => "Contraseña de clave de recuperación",
 "Enabled" => "Habilitar",
 "Disabled" => "Deshabilitado",
-"Change encryption passwords recovery key:" => "Cambiar clave de cifrado de contraseñas:",
-"Old Recovery account password" => "Contraseña de recuperación actual",
-"New Recovery account password" => "Contraseña de recuperación nueva",
+"Change recovery key password:" => "Cambiar la contraseña de la clave de recuperación",
+"Old Recovery key password" => "Contraseña de la antigua clave de recuperación",
+"New Recovery key password" => "Contraseña de la nueva clave de recuperación",
 "Change Password" => "Cambiar contraseña",
+"Your private key password no longer match your log-in password:" => "Su contraseña de clave privada ya no coincide con su contraseña de acceso:",
+"Set your old private key password to your current log-in password." => "Establecer la contraseña de su antigua clave privada a su contraseña actual de acceso.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus ficheros.",
+"Old log-in password" => "Contraseña de acceso antigua",
+"Current log-in password" => "Contraseña de acceso actual",
+"Update Private Key Password" => "Actualizar Contraseña de Clave Privada",
+"Enable password recovery:" => "Habilitar la recuperación de contraseña:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitar esta opción le permitirá volver a tener acceso a sus ficheros cifrados en caso de pérdida de contraseña",
 "File recovery settings updated" => "Opciones de recuperación de archivos actualizada",
 "Could not update file recovery" => "No se pudo actualizar la recuperación de archivos"
 );

apps/files_encryption/l10n/es_AR.php

@@ -1,8 +1,36 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Se habilitó la recuperación de archivos",
+"Could not enable recovery key. Please check your recovery key password!" => "No se pudo habilitar la clave de recuperación. Por favor, comprobá tu contraseña.",
+"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
+"Could not disable recovery key. Please check your recovery key password!" => "No fue posible deshabilitar la clave de recuperación.  Por favor, comprobá tu contraseña.",
 "Password successfully changed." => "Tu contraseña fue cambiada",
 "Could not change the password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Comprobá 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 fue posible actualizar la contraseña de la clave privada. Tal vez la contraseña antigua no es correcta.",
+"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada de alguna manera. Podés actualizar tu clave privada de contraseña en 'configuración personal' para tener acceso nuevamente a tus archivos",
+"PHP module OpenSSL is not installed." => "El módulo OpenSSL para PHP no está instalado.",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Pedile al administrador del servidor que instale el módulo. Por ahora la App de encriptación está deshabilitada.",
 "Saving..." => "Guardando...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada desde afuera.",
+"You can unlock your private key in your " => "Podés desbloquear tu clave privada en tu",
+"personal settings" => "Configuración personal",
 "Encryption" => "Encriptación",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Habilitar clave de recuperación de contraseñas (permite compartir clave de contraseñas):",
-"Recovery account password" => "Recuperar contraseña"
+"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar clave de recuperación (te permite recuperar los archivos de usuario en el caso en que pierdas la contraseña):",
+"Recovery key password" => "Contraseña de recuperación de clave",
+"Enabled" => "Habilitado",
+"Disabled" => "Deshabilitado",
+"Change recovery key password:" => "Cambiar contraseña para recuperar la clave:",
+"Old Recovery key password" => "Contraseña antigua de recuperación de clave",
+"New Recovery key password" => "Nueva contraseña de recuperación de clave",
+"Change Password" => "Cambiar contraseña",
+"Your private key password no longer match your log-in password:" => "Tu contraseña de recuperación de clave ya no coincide con la contraseña de ingreso:",
+"Set your old private key password to your current log-in password." => "Usá tu contraseña de recuperación de clave antigua para tu contraseña de ingreso actual.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Si no te acordás de tu contraseña antigua, pedile al administrador que recupere tus archivos",
+"Old log-in password" => "Contraseña anterior",
+"Current log-in password" => "Contraseña actual",
+"Update Private Key Password" => "Actualizar contraseña de la clave privada",
+"Enable password recovery:" => "Habilitar contraseña de recuperación:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitando esta opción te va a permitir tener acceso a tus archivos encriptados incluso si perdés la contraseña",
+"File recovery settings updated" => "Las opciones de recuperación de archivos fueron actualizadas",
+"Could not update file recovery" => "No fue posible actualizar la recuperación de archivos"
 );

apps/files_encryption/l10n/et_EE.php

@@ -7,13 +7,8 @@
 "Could not change the password. Maybe the old password was not correct." => "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud.",
 "Saving..." => "Salvestamine...",
 "Encryption" => "Krüpteerimine",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Luba krüpteerimise paroolide taastevõti (võimalda parooli jagamine taastevõtmesse):",
-"Recovery account password" => "Konto taasteparool",
 "Enabled" => "Sisse lülitatud",
 "Disabled" => "Väljalülitatud",
-"Change encryption passwords recovery key:" => "Muuda taaste võtme krüpteerimise paroole:",
-"Old Recovery account password" => "Konto vana taaste parool",
-"New Recovery account password" => "Konto uus taasteparool",
 "Change Password" => "Muuda parooli",
 "File recovery settings updated" => "Faili taaste seaded uuendatud",
 "Could not update file recovery" => "Ei suuda uuendada taastefaili"

apps/files_encryption/l10n/eu.php

@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Saving..." => "Gordetzen...",
-"Encryption" => "Enkriptazioa"
+"Encryption" => "Enkriptazioa",
+"Enabled" => "Gaitua",
+"Disabled" => "Ez-gaitua",
+"Change Password" => "Aldatu Pasahitza"
 );

apps/files_encryption/l10n/fr.php

@@ -1,28 +1,36 @@
 <?php $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Clé de récupération activée avec succès",
-"Could not enable recovery key. Please check your recovery key password!" => "Ne peut pas activer la clé de récupération. s'il vous plait vérifiez votre mot de passe de clé de récupération!",
-"Recovery key successfully disabled" => "Clé de récupération désactivée avc succès",
-"Could not disable recovery key. Please check your recovery key password!" => "Ne peut pas désactiver la clé de récupération. S'il vous plait vérifiez votre mot de passe de clé de récupération!",
+"Could not enable recovery key. Please check your recovery key password!" => "Impossible d'activer la clé de récupération. Veuillez vérifier votre mot de passe de clé de récupération !",
+"Recovery key successfully disabled" => "Clé de récupération désactivée avec succès",
+"Could not disable recovery key. Please check your recovery key password!" => "Impossible de désactiver la clé de récupération. Veuillez vérifier votre mot de passe de clé de récupération !",
 "Password successfully changed." => "Mot de passe changé avec succès ",
 "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.",
+"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "Votre clef privée est invalide ! Votre mot de passe a peut-être été modifié depuis l'extérieur. Vous pouvez 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",
+"PHP module OpenSSL is not installed." => "Le module OpenSSL de PHP n'est pas installé.",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Veuillez demander à l'administrateur du serveur d'installer le module. Pour l'instant l'application de chiffrement a été désactivé.",
 "Saving..." => "Enregistrement...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Votre clef privée est invalide ! Votre mot de passe a peut-être été modifié depuis l'extérieur.",
 "You can unlock your private key in your " => "Vous pouvez déverrouiller votre clé privée dans votre",
 "personal settings" => "paramètres personnel",
 "Encryption" => "Chiffrement",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activer la clé de récupération par mots de passe de cryptage (autoriser le partage de la clé de récupération) ",
-"Recovery account password" => "Rétablissement du compte mot de passe ",
+"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",
 "Enabled" => "Activer",
 "Disabled" => "Désactiver",
-"Change encryption passwords recovery key:" => "Changer les mots de passe de cryptage par la clé de récupération",
-"Old Recovery account password" => "Ancien compte de récupération de mots de passe",
-"New Recovery account password" => "Nouveau compte de récupération de mots de passe",
+"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",
 "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. ",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Si vous ne vous souvenez plus de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers.",
 "Old log-in password" => "Ancien mot de passe de connexion",
 "Current log-in password" => "Actuel mot de passe de connexion",
 "Update Private Key Password" => "Mettre à jour le mot de passe de votre clé privée",
-"Enable password recovery:" => "Activer la récupération du mot de passe:",
-"File recovery settings updated" => "Mise à jour des paramètres de récupération de fichiers ",
+"Enable password recovery:" => "Activer la récupération du mot de passe :",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Activer cette option vous permettra d'obtenir à nouveau l'accès à vos fichiers chiffrés en cas de perte de mot de passe",
+"File recovery settings updated" => "Paramètres de récupération de fichiers mis à jour",
 "Could not update file recovery" => "Ne peut pas remettre à jour les fichiers de récupération"
 );

apps/files_encryption/l10n/gl.php

@@ -8,18 +8,20 @@
 "Private key password successfully updated." => "A chave privada foi actualizada correctamente.",
 "Could not update the private key password. Maybe the old password was not correct." => "Non foi posíbel actualizar o contrasinal da chave privada. É probábel que o contrasinal antigo non sexa correcto.",
 "Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior. Vostede pode actualizar o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros",
+"PHP module OpenSSL is not installed." => "O módulo PHP OpenSSL non está instalado.",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Pregúntelle ao administrador do servidor pola instalación do módulo. Polo de agora o aplicativo de cifrado foi desactivado.",
 "Saving..." => "Gardando...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior. ",
 "You can unlock your private key in your " => "Pode desbloquear a chave privada nos seus",
 "personal settings" => "axustes persoais",
 "Encryption" => "Cifrado",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activar a chave  de recuperación do cifrado de contrasinais (permite compartir a chave de recuperación):",
-"Recovery account password" => "Recuperación do contrasinal da conta",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Activar a chave de recuperación (permitirá recuperar os ficheiros dos usuarios no caso de perda do contrasinal):",
+"Recovery key password" => "Contrasinal da chave de recuperación",
 "Enabled" => "Activado",
 "Disabled" => "Desactivado",
-"Change encryption passwords recovery key:" => "Cambiar a chave de la recuperación do cifrado de contrasinais:",
-"Old Recovery account password" => "Antigo contrasinal de recuperación da conta",
-"New Recovery account password" => "Novo contrasinal de recuperación da conta",
+"Change recovery key password:" => "Cambiar o contrasinal da chave de la recuperación:",
+"Old Recovery key password" => "Antigo contrasinal da chave de recuperación",
+"New Recovery key password" => "Novo contrasinal da chave de recuperación",
 "Change Password" => "Cambiar o contrasinal",
 "Your private key password no longer match your log-in password:" => "O seu contrasinal da chave privada non coincide co seu contrasinal de acceso.",
 "Set your old private key password to your current log-in password." => "Estabeleza o seu contrasinal antigo da chave de recuperación ao seu contrasinal de acceso actual",

apps/files_encryption/l10n/it.php

@@ -7,28 +7,30 @@
 "Could not change the password. Maybe the old password was not correct." => "Impossibile cambiare la password. Forse la vecchia password non era corretta.",
 "Private key password successfully updated." => "Password della chiave privata aggiornata correttamente.",
 "Could not update the private key password. Maybe the old password was not correct." => "Impossibile aggiornare la password della chiave privata. Forse la vecchia password non era corretta.",
-"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "La chiave privata non è valida! Forse la password è stata cambiata dall'esterno. Puoi aggiornare la password della chiave privata nelle impostazioni personali per riottenere l'accesso ai file.",
+"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "La chiave privata non è valida! Forse la password è stata cambiata dall'esterno. Puoi aggiornare la password della chiave privata nelle impostazioni personali per ottenere nuovamente l'accesso ai file.",
+"PHP module OpenSSL is not installed." => "Il modulo PHP OpenSSL non è installato.",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Chiedi all'amministratore del server di installare il modulo. Per ora la crittografia è disabilitata.",
 "Saving..." => "Salvataggio in corso...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "La tua chiave privata non è valida! Forse è stata modifica dall'esterno.",
-"You can unlock your private key in your " => "Puoi sbloccare la chiave privata nel tuo",
-"personal settings" => "Impostazioni personali",
+"You can unlock your private key in your " => "Puoi sbloccare la chiave privata nelle tue",
+"personal settings" => "impostazioni personali",
 "Encryption" => "Cifratura",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Abilita la chiave di ripristino delle password di cifratura (consente di condividere la chiave di ripristino):",
-"Recovery account password" => "Password di ripristino dell'account",
+"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",
 "Enabled" => "Abilitata",
 "Disabled" => "Disabilitata",
-"Change encryption passwords recovery key:" => "Cambia la chiave di ripristino delle password di cifratura:",
-"Old Recovery account password" => "Vecchia password di ripristino dell'account",
-"New Recovery account password" => "Nuova password di ripristino dell'account",
+"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",
 "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 login:",
-"Set your old private key password to your current log-in password." => "Imposta la vecchia password della chiave privata sull'attuale password di login",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file",
-"Old log-in password" => "Password di login vecchia",
-"Current log-in password" => "Password di login corrente",
-"Update Private Key Password" => "Aggiorna la Password della Chiave Privata",
-"Enable password recovery:" => "Abilita il recupero della password:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Abilitando questa opzione potrai riaccedere ai file cifrati nel caso in cui la password venga perduta",
+"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.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file.",
+"Old log-in password" => "Vecchia password di accesso",
+"Current log-in password" => "Password di accesso attuale",
+"Update Private Key Password" => "Aggiorna la password della chiave privata",
+"Enable password recovery:" => "Abilita il ripristino della password:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "L'abilitazione di questa opzione ti consentirà di accedere nuovamente ai file cifrati in caso di perdita della password",
 "File recovery settings updated" => "Impostazioni di ripristino dei file aggiornate",
 "Could not update file recovery" => "Impossibile aggiornare il ripristino dei file"
 );

apps/files_encryption/l10n/ja_JP.php

@@ -8,18 +8,20 @@
 "Private key password successfully updated." => "秘密鍵のパスワードが正常に更新されました。",
 "Could not update the private key password. Maybe the old password was not correct." => "秘密鍵のパスワードを更新できませんでした。古いパスワードが正確でない場合があります。",
 "Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "秘密鍵が有効ではありません。パスワードが外部から変更された恐れがあります。。個人設定で秘密鍵のパスワードを更新して、ファイルへのアクセス権を奪還できます。",
+"PHP module OpenSSL is not installed." => "PHPのモジュール OpenSSLがインストールされていません。",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "サーバーの管理者にモジュールのインストールを頼んでください。さしあたり暗号化アプリは無効化されました。",
 "Saving..." => "保存中...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "秘密鍵が有効ではありません。パスワードが外部から変更された恐れがあります。",
 "You can unlock your private key in your " => "個人設定で",
 "personal settings" => "秘密鍵をアンロックできます",
 "Encryption" => "暗号化",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "暗号化パスワードの復旧キーを有効にする(復旧キーを共有することを許可):",
-"Recovery account password" => "復旧アカウントのパスワード",
+"Enable recovery key (allow to recover users files in case of password loss):" => "復旧キーを有効化 (万一パスワードを亡くした場合もユーザーのファイルを回復できる):",
+"Recovery key password" => "復旧キーのパスワード",
 "Enabled" => "有効",
 "Disabled" => "無効",
-"Change encryption passwords recovery key:" => "復旧キーの暗号化パスワードを変更:",
-"Old Recovery account password" => "古い復旧アカウントのパスワード",
-"New Recovery account password" => "新しい復旧アカウントのパスワード",
+"Change recovery key password:" => "復旧キーのパスワードを変更:",
+"Old Recovery key password" => "古い復旧キーのパスワード",
+"New Recovery key password" => "新しい復旧キーのパスワード",
 "Change Password" => "パスワードを変更",
 "Your private key password no longer match your log-in password:" => "もはや秘密鍵はログインパスワードと一致しません:",
 "Set your old private key password to your current log-in password." => "古い秘密鍵のパスワードを現在のログインパスワードに設定する。",

apps/files_encryption/l10n/lt_LT.php

@@ -7,13 +7,8 @@
 "Could not change the password. Maybe the old password was not correct." => "Slaptažodis nebuvo pakeistas. Gali būti, kad buvo neteisingai suvestas senasis.",
 "Saving..." => "Saugoma...",
 "Encryption" => "Šifravimas",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Įjungti šifravimo slaptažodžio atstatymo raktą (leidžia dalintis su atstatymo raktu):",
-"Recovery account password" => "Atstatymo vartotojo slaptažodis",
 "Enabled" => "Įjungta",
 "Disabled" => "Išjungta",
-"Change encryption passwords recovery key:" => "Pakeisti šifravimo slaptažodžio atstatymo raktą:",
-"Old Recovery account password" => "Seno atstatymo vartotojo slaptažodis",
-"New Recovery account password" => "naujo atstatymo vartotojo slaptažodis",
 "Change Password" => "Pakeisti slaptažodį",
 "File recovery settings updated" => "Failų atstatymo nustatymai pakeisti",
 "Could not update file recovery" => "Neišėjo atnaujinti failų atkūrimo"

apps/files_encryption/l10n/nl.php

@@ -5,19 +5,26 @@
 "Could not disable recovery key. Please check your recovery key password!" => "Kon herstelsleutel niet deactiveren. Controleer het wachtwoord van uw herstelsleutel!",
 "Password successfully changed." => "Wachtwoord succesvol gewijzigd.",
 "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.",
+"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "Uw privésleutel is niet geldig! Misschien was uw wachtwoord van buitenaf gewijzigd. U kunt het wachtwoord van uw privésleutel bijwerking in uw persoonlijke instellingen om bij uw bestanden te komen.",
+"PHP module OpenSSL is not installed." => "PHP module OpenSSL is niet geïnstalleerd.",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Vraag uw beheerder deze module te installeren. Tot zolang is de crypto app gedeactiveerd.",
 "Saving..." => "Opslaan",
 "Your private key is not valid! Maybe the your password was changed from outside." => "Uw privésleutel is niet geldig. Misschien was uw wachtwoord van buitenaf gewijzigd.",
 "You can unlock your private key in your " => "U kunt uw privésleutel deblokkeren in uw",
 "personal settings" => "persoonlijke instellingen",
 "Encryption" => "Versleuteling",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activeer versleuteling van wachtwoorden herstelsleutel (maak delen met herstel sleutel mogelijk):",
-"Recovery account password" => "Herstel account wachtwoord",
+"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",
 "Enabled" => "Geactiveerd",
 "Disabled" => "Gedeactiveerd",
-"Change encryption passwords recovery key:" => "Wijzig versleuteling wachtwoord herstelsleutel",
-"Old Recovery account password" => "Oude herstel account wachtwoord",
-"New Recovery account password" => "Nieuwe herstel account wachtwoord",
+"Change recovery key password:" => "Wijzig wachtwoord herstelsleutel:",
+"Old Recovery key password" => "Oude wachtwoord herstelsleutel",
+"New Recovery key password" => "Nieuwe wachtwoord herstelsleutel",
 "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.",
 " If you don't remember your old password you can ask your administrator to recover your files." => "Als u uw oude wachtwoord niet meer weet, kunt u uw beheerder vragen uw bestanden terug te halen.",
 "Old log-in password" => "Oude wachtwoord",
 "Current log-in password" => "Huidige wachtwoord",

apps/files_encryption/l10n/pl.php

@@ -8,18 +8,15 @@
 "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.",
 "Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "Klucz prywatny nie jest poprawny! Może Twoje hasło zostało zmienione z zewnątrz. Można zaktualizować hasło klucza prywatnego w ustawieniach osobistych w celu odzyskania dostępu do plików",
+"PHP module OpenSSL is not installed." => "Moduł PHP OpenSSL nie jest zainstalowany",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Proszę poproś administratora serwera aby zainstalował ten moduł. Obecnie aplikacja szyfrowanie została wyłączona.",
 "Saving..." => "Zapisywanie...",
 "Your private key is not valid! Maybe the your password was changed from outside." => "Klucz prywatny nie jest poprawny! Może Twoje hasło zostało zmienione z zewnątrz.",
 "You can unlock your private key in your " => "Możesz odblokować swój klucz prywatny w swojej",
 "personal settings" => "Ustawienia osobiste",
 "Encryption" => "Szyfrowanie",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Włącz szyfrowanie odzyskiwanych haseł klucza (zezwalaj na odzyskiwanie klucza):",
-"Recovery account password" => "Odzyskiwanie hasła konta",
 "Enabled" => "Włączone",
 "Disabled" => "Wyłączone",
-"Change encryption passwords recovery key:" => "Zmiana klucza szyfrowania haseł odzyskiwania:",
-"Old Recovery account password" => "Stare hasło odzyskiwania",
-"New Recovery account password" => "Nowe hasło 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

@@ -5,16 +5,32 @@
 "Could not disable recovery key. Please check your recovery key password!" => "Impossível desabilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!",
 "Password successfully changed." => "Senha alterada com sucesso.",
 "Could not change the password. Maybe the old password was not correct." => "Não foi possível alterar a senha. Talvez a senha antiga não estava correta.",
+"Private key password successfully updated." => "Senha de chave privada atualizada com sucesso.",
+"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.",
+"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "Sua chave privada não é válida! Talvez sua senha tenha sido mudada. Você pode atualizar sua senha de chave privada nas suas configurações pessoais para obter novamente acesso aos seus arquivos.",
+"PHP module OpenSSL is not installed." => "O módulo PHP OpenSSL não está instalado.",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Por favor peça ao administrador do servidor para instalar o módulo. Por enquanto o app de encriptação foi desabilitada.",
 "Saving..." => "Salvando...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Sua chave privada não é válida! Talvez sua senha tenha sido mudada.",
+"You can unlock your private key in your " => "Você pode desbloquear sua chave privada nas suas",
+"personal settings" => "configurações pessoais.",
 "Encryption" => "Criptografia",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Ativar a criptografia de chave de recuperação de senhas (permitir compartilhar a chave de recuperação):",
-"Recovery account password" => "Recuperar a senha da conta",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar chave de recuperação (permite recuperar arquivos de usuários em caso de perda de senha):",
+"Recovery key password" => "Senha da chave de recuperação",
 "Enabled" => "Habilidado",
 "Disabled" => "Desabilitado",
-"Change encryption passwords recovery key:" => "Mudar a criptografia de chave de recuperação de senhas:",
-"Old Recovery account password" => "Recuperação de senha de conta antiga",
-"New Recovery account password" => "Senha Nova  da conta de Recuperação",
+"Change recovery key password:" => "Mudar a senha da chave de recuperação:",
+"Old Recovery key password" => "Senha antiga da chave de recuperação",
+"New Recovery key password" => "Nova senha da chave de recuperação",
 "Change Password" => "Trocar Senha",
+"Your private key password no longer match your log-in password:" => "Sua senha de chave privada não coincide mais com sua senha de login:",
+"Set your old private key password to your current log-in password." => "Configure sua antiga senha de chave privada para sua atual senha de login.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Se você não se lembra de sua antiga senha você pode pedir ao administrador que recupere seus arquivos.",
+"Old log-in password" => "Senha antiga de login",
+"Current log-in password" => "Atual senha de login",
+"Update Private Key Password" => "Atualizar senha de chave privada",
+"Enable password recovery:" => "Habilitar recuperação de senha:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitar essa opção vai permitir que você obtenha novamente acesso aos seus arquivos encriptados em caso de perda de senha",
 "File recovery settings updated" => "Configurações de recuperação de arquivo atualizado",
 "Could not update file recovery" => "Não foi possível atualizar a recuperação de arquivos"
 );

apps/files_encryption/l10n/pt_PT.php

@@ -7,13 +7,8 @@
 "Could not change the password. Maybe the old password was not correct." => "Não foi possivel alterar a password. Possivelmente a password antiga não está correcta.",
 "Saving..." => "A guardar...",
 "Encryption" => "Encriptação",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activar a chave de recuperação das passwords de encriptação (permitir partilha da chave de recuperação):",
-"Recovery account password" => "Password de recuperação de conta",
 "Enabled" => "Activado",
 "Disabled" => "Desactivado",
-"Change encryption passwords recovery key:" => "Alterar a chave de recuperação da password de encriptação:",
-"Old Recovery account password" => "Password de recuperação de conta antiga:",
-"New Recovery account password" => "Nova password de recuperação de conta",
 "Change Password" => "Mudar a Password",
 "File recovery settings updated" => "Actualizadas as definições de recuperação de ficheiros",
 "Could not update file recovery" => "Não foi possível actualizar a recuperação de ficheiros"

apps/files_encryption/l10n/ru.php

@@ -1,16 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Ключ восстановления успешно установлен",
+"Recovery key successfully disabled" => "Ключ восстановления успешно отключен",
 "Password successfully changed." => "Пароль изменен удачно.",
 "Could not change the password. Maybe the old password was not correct." => "Невозможно изменить пароль. Возможно старый пароль не был верен.",
 "Saving..." => "Сохранение...",
+"personal settings" => "персональные настройки",
 "Encryption" => "Шифрование",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Включить шифрование пароля ключа восстановления (понадобится разрешение для восстановления ключа)",
-"Recovery account password" => "Восстановление пароля учетной записи",
 "Enabled" => "Включено",
 "Disabled" => "Отключено",
-"Change encryption passwords recovery key:" => "Изменить шифрование пароля ключа восстановления:",
-"Old Recovery account password" => "Старое Восстановление пароля учетной записи",
-"New Recovery account password" => "Новое Восстановление пароля учетной записи",
 "Change Password" => "Изменить пароль",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Если вы не помните свой старый пароль, вы можете попросить своего администратора восстановить ваши файлы",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Включение этой опции позволит вам получить доступ к своим зашифрованным файлам в случае утери пароля",
 "File recovery settings updated" => "Настройки файла восстановления обновлены",
 "Could not update file recovery" => "Невозможно обновить файл восстановления"
 );

apps/files_encryption/l10n/sk_SK.php

@@ -1,11 +1,28 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Záchranný kľúč bol úspešne povolený",
+"Could not enable recovery key. Please check your recovery key password!" => "Nepodarilo sa povoliť záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!",
+"Recovery key successfully disabled" => "Záchranný kľúč bol úspešne zakázaný",
+"Could not disable recovery key. Please check your recovery key password!" => "Nepodarilo sa zakázať záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!",
 "Password successfully changed." => "Heslo úspešne zmenené.",
+"Could not change the password. Maybe the old password was not correct." => "Nemožno zmeniť heslo. Pravdepodobne nebolo staré heslo zadané správne.",
+"Private key password successfully updated." => "Heslo súkromného kľúča je úspešne aktualizované.",
+"Could not update the private key password. Maybe the old password was not correct." => "Nemožno aktualizovať heslo súkromného kľúča. Možno nebolo staré heslo správne.",
+"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "Váš súkromný kľúč je neplatný. Možno bolo Vaše heslo zmenené z vonku. Môžete aktualizovať heslo súkromného kľúča v osobnom nastavení na opätovné získanie prístupu k súborom",
 "Saving..." => "Ukladám...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Váš súkromný kľúč je neplatný. Možno bolo Vaše heslo zmenené z vonku.",
+"personal settings" => "osobné nastavenia",
 "Encryption" => "Šifrovanie",
 "Enabled" => "Povolené",
 "Disabled" => "Zakázané",
-"Change encryption passwords recovery key:" => "Zmeniť šifrovacie heslo obnovovacieho kľúča:",
 "Change Password" => "Zmeniť heslo",
+"Your private key password no longer match your log-in password:" => "Vaše heslo súkromného kľúča je rovnaké ako Vaše prihlasovacie heslo:",
+"Set your old private key password to your current log-in password." => "Nastavte si staré heslo súkromného kľúča k Vášmu súčasnému prihlasovaciemu heslu.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Ak si nepamätáte svoje staré heslo, môžete požiadať správcu o obnovenie svojich súborov.",
+"Old log-in password" => "Staré prihlasovacie heslo",
+"Current log-in password" => "Súčasné prihlasovacie heslo",
+"Update Private Key Password" => "Aktualizovať heslo súkromného kľúča",
+"Enable password recovery:" => "Povoliť obnovu hesla:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Povolenie Vám umožní znovu získať prístup k Vašim zašifrovaným súborom, ak stratíte heslo",
 "File recovery settings updated" => "Nastavenie obnovy súborov aktualizované",
 "Could not update file recovery" => "Nemožno aktualizovať obnovenie súborov"
 );

apps/files_encryption/l10n/sl.php

@@ -1,4 +1,14 @@
 <?php $TRANSLATIONS = array(
+"Password successfully changed." => "Geslo je bilo uspešno spremenjeno.",
+"Could not change the password. Maybe the old password was not correct." => "Gesla ni bilo mogoče spremeniti. Morda vnos starega gesla ni bil pravilen.",
 "Saving..." => "Poteka shranjevanje ...",
-"Encryption" => "Šifriranje"
+"personal settings" => "osebne nastavitve",
+"Encryption" => "Šifriranje",
+"Enabled" => "Omogočeno",
+"Disabled" => "Onemogočeno",
+"Change Password" => "Spremeni geslo",
+"Old log-in password" => "Staro geslo",
+"Current log-in password" => "Trenutno geslo",
+"File recovery settings updated" => "Nastavitve obnavljanja dokumentov so bile posodobljene",
+"Could not update file recovery" => "Nastavitev za obnavljanje dokumentov ni bilo mogoče posodobiti"
 );

apps/files_encryption/l10n/sv.php

@@ -13,13 +13,8 @@
 "You can unlock your private key in your " => "Du kan låsa upp din privata nyckel i dina",
 "personal settings" => "personliga inställningar",
 "Encryption" => "Kryptering",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Aktivera återställningsnyckel för krypterade lösenord. (tillåt delning till återställningsnyckeln):",
-"Recovery account password" => "Återställning av kontolösenord",
 "Enabled" => "Aktiverad",
 "Disabled" => "Inaktiverad",
-"Change encryption passwords recovery key:" => "Ändra återställningsnyckeln för krypterade lösenord:",
-"Old Recovery account password" => "Gamla lösenordet för återställningskontot",
-"New Recovery account password" => "Nytt återställningslösenord för kontot",
 "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.",
@@ -28,6 +23,7 @@
 "Current log-in password" => "Nuvarande inloggningslösenord",
 "Update Private Key Password" => "Uppdatera den privata lösenordsnyckeln",
 "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",
 "Could not update file recovery" => "Kunde inte uppdatera filåterställning"
 );

apps/files_encryption/l10n/tr.php

@@ -7,13 +7,8 @@
 "Could not change the password. Maybe the old password was not correct." => "Parola değiştirilemedi. Eski parolanız doğru olmayabilir",
 "Saving..." => "Kaydediliyor...",
 "Encryption" => "Şifreleme",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Şifreli parola kurtarma anahtarını etkinleştir(kurtarma anahtarı paylaşımına izin ver)",
-"Recovery account password" => "Kurtarma hesabı parolası",
 "Enabled" => "Etkinleştirildi",
 "Disabled" => "Devre dışı",
-"Change encryption passwords recovery key:" => "Şifreli parolalar kurtarma anahtarını değiştir:",
-"Old Recovery account password" => "Eski kurtarma hesabı parolası",
-"New Recovery account password" => "Yeni kurtarma hesabı parolası",
 "Change Password" => "Parola değiştir",
 "File recovery settings updated" => "Dosya kurtarma ayarları güncellendi",
 "Could not update file recovery" => "Dosya kurtarma güncellenemedi"

apps/files_encryption/l10n/vi.php

@@ -3,7 +3,6 @@
 "Could not change the password. Maybe the old password was not correct." => "Không thể đổi mật khẩu. Có lẽ do mật khẩu cũ không đúng.",
 "Saving..." => "Đang lưu...",
 "Encryption" => "Mã hóa",
-"Recovery account password" => "Mật khẩu cho tài khoản cứu hộ",
 "Enabled" => "Bật",
 "Disabled" => "Tắt",
 "Change Password" => "Đổi Mật khẩu"

apps/files_encryption/l10n/zh_CN.php

@@ -7,13 +7,8 @@
 "Could not change the password. Maybe the old password was not correct." => "不能修改密码。旧密码可能不正确。",
 "Saving..." => "保存中",
 "Encryption" => "加密",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "启用加密密码恢复密钥（允许共享恢复密钥）：",
-"Recovery account password" => "恢复账户密码",
 "Enabled" => "开启",
 "Disabled" => "禁用",
-"Change encryption passwords recovery key:" => "变更加密密码恢复密钥：",
-"Old Recovery account password" => "旧恢复账号密码",
-"New Recovery account password" => "新恢复账号密码",
 "Change Password" => "修改密码",
 "File recovery settings updated" => "文件恢复设置已更新",
 "Could not update file recovery" => "不能更新文件恢复"

apps/files_encryption/l10n/zh_TW.php

@@ -5,7 +5,6 @@
 "Encryption" => "加密",
 "Enabled" => "已啓用",
 "Disabled" => "已停用",
-"Change encryption passwords recovery key:" => "變更加密密碼還原金鑰：",
 "Change Password" => "變更密碼",
 "File recovery settings updated" => "檔案還原設定已更新",
 "Could not update file recovery" => "無法更新檔案還原設定"

apps/files_encryption/lib/crypt.php

@@ -51,21 +51,26 @@ class Crypt {
 	 */
 	public static function createKeypair() {
 
+		$return = false;
+
 		$res = openssl_pkey_new(array('private_key_bits' => 4096));
 
-		// Get private key
-		openssl_pkey_export($res, $privateKey);
+		if ($res === false) {
+			\OCP\Util::writeLog('Encryption library', 'couldn\'t generate users key-pair for ' . \OCP\User::getUser(), \OCP\Util::ERROR);
+		} elseif (openssl_pkey_export($res, $privateKey)) {
+			// Get public key
+			$publicKey = openssl_pkey_get_details($res);
+			$publicKey = $publicKey['key'];
 
-		// Get public key
-		$publicKey = openssl_pkey_get_details($res);
-
-		$publicKey = $publicKey['key'];
-
-		return (array(
-			'publicKey' => $publicKey,
-			'privateKey' => $privateKey
-		));
+			$return = array(
+				'publicKey' => $publicKey,
+				'privateKey' => $privateKey
+			);
+		} else {
+			\OCP\Util::writeLog('Encryption library', 'couldn\'t export users private key, please check your servers openSSL configuration.' . \OCP\User::getUser(), \OCP\Util::ERROR);
+		}
 
+		return $return;
 	}
 
 	/**
@@ -287,28 +292,22 @@ class Crypt {
 	public static function symmetricEncryptFileContent($plainContent, $passphrase = '') {
 
 		if (!$plainContent) {
-
+			\OCP\Util::writeLog('Encryption library', 'symmetrically encryption failed, no content given.', \OCP\Util::ERROR);
 			return false;
-
 		}
 
 		$iv = self::generateIv();
 
 		if ($encryptedContent = self::encrypt($plainContent, $iv, $passphrase)) {
-
 			// Combine content to encrypt with IV identifier and actual IV
 			$catfile = self::concatIv($encryptedContent, $iv);
-
 			$padded = self::addPadding($catfile);
 
 			return $padded;
 
 		} else {
-
 			\OCP\Util::writeLog('Encryption library', 'Encryption (symmetric) of keyfile content failed', \OCP\Util::ERROR);
-
 			return false;
-
 		}
 
 	}

apps/files_encryption/lib/util.php

@@ -228,18 +228,21 @@ class Util {
 			// Generate keypair
 			$keypair = Crypt::createKeypair();
 
-			\OC_FileProxy::$enabled = false;
+			if ($keypair) {
 
-			// Save public key
-			$this->view->file_put_contents($this->publicKeyPath, $keypair['publicKey']);
+				\OC_FileProxy::$enabled = false;
 
-			// Encrypt private key with user pwd as passphrase
-			$encryptedPrivateKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], $passphrase);
+				// Encrypt private key with user pwd as passphrase
+				$encryptedPrivateKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], $passphrase);
 
-			// Save private key
-			$this->view->file_put_contents($this->privateKeyPath, $encryptedPrivateKey);
+				// Save key-pair
+				if ($encryptedPrivateKey) {
+					$this->view->file_put_contents($this->privateKeyPath, $encryptedPrivateKey);
+					$this->view->file_put_contents($this->publicKeyPath, $keypair['publicKey']);
+				}
 
-			\OC_FileProxy::$enabled = true;
+				\OC_FileProxy::$enabled = true;
+			}
 
 		} else {
 			// check if public-key exists but private-key is missing

apps/files_encryption/templates/settings-admin.php

@@ -7,11 +7,11 @@
 		</p>
 
 		<p>
-			<?php p($l->t("Enable encryption passwords recovery key (allow sharing to recovery key):")); ?>
+			<?php p($l->t("Enable recovery key (allow to recover users files in case of password loss):")); ?>
 			<br/>
 			<br/>
 			<input type="password" name="recoveryPassword" id="recoveryPassword"/>
-			<label for="recoveryPassword"><?php p($l->t("Recovery account password")); ?></label>
+			<label for="recoveryPassword"><?php p($l->t("Recovery key password")); ?></label>
 			<br/>
 			<input
 				type='radio'
@@ -31,21 +31,21 @@
 		<br/><br/>
 
 		<p>
-			<strong><?php p($l->t("Change encryption passwords recovery key:")); ?></strong>
+			<strong><?php p($l->t("Change recovery key password:")); ?></strong>
 			<br/><br/>
 			<input
 				type="password"
 				name="changeRecoveryPassword"
 				id="oldRecoveryPassword"
 				<?php echo($_["recoveryEnabled"] == 0 ? 'disabled' : ''); ?> />
-			<label for="oldRecoveryPassword"><?php p($l->t("Old Recovery account password")); ?></label>
+			<label for="oldRecoveryPassword"><?php p($l->t("Old Recovery key password")); ?></label>
 			<br/>
 			<input
 				type="password"
 				name="changeRecoveryPassword"
 				id="newRecoveryPassword"
 				<?php echo($_["recoveryEnabled"] == 0 ? 'disabled' : ''); ?> />
-			<label for="newRecoveryPassword"><?php p($l->t("New Recovery account password")); ?></label>
+			<label for="newRecoveryPassword"><?php p($l->t("New Recovery key password")); ?></label>
 			<br/>
 			<button
 				type="button"

apps/files_external/l10n/ko.php

@@ -6,11 +6,14 @@
 "Error configuring Google Drive storage" => "Google 드라이브 저장소 설정 오류",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>경고:</b> \"smbclient\"가 설치되지 않았습니다. CIFS/SMB 공유 자원에 연결할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>경고:</b> PHP FTP 지원이 비활성화되어 있거나 설치되지 않았습니다. FTP 공유를 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>경고:</b> PHP Curl 지원이 비활성화되어 있거나 설치되지 않았습니다. 다른 ownCloud, WebDAV, Google 드라이브 공유를 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
 "External Storage" => "외부 저장소",
 "Folder name" => "폴더 이름",
+"External storage" => "외부 저장소",
 "Configuration" => "설정",
 "Options" => "옵션",
 "Applicable" => "적용 가능",
+"Add storage" => "저장소 추가",
 "None set" => "설정되지 않음",
 "All Users" => "모든 사용자",
 "Groups" => "그룹",

apps/files_trashbin/l10n/eo.php

@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Error" => "Eraro",
+"Delete permanently" => "Forigi por ĉiam",
 "Name" => "Nomo",
 "1 folder" => "1 dosierujo",
 "{count} folders" => "{count} dosierujoj",

apps/files_versions/l10n/ko.php

@@ -1,11 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Could not revert: %s" => "되돌릴 수 없습니다: %s",
-"success" => "완료",
-"File %s was reverted to version %s" => "파일 %s를 버전 %s로 변경하였습니다.",
+"success" => "성공",
+"File %s was reverted to version %s" => "파일 %s을(를) 버전 %s(으)로 되돌림",
 "failure" => "실패",
-"File %s could not be reverted to version %s" => "파일 %s를 버전 %s로 되돌리지 못했습니다.",
-"No old versions available" => "오래된 버전을 사용할 수 없습니다",
-"No path specified" => "경로를 알수 없습니다.",
-"Versions" => "버젼",
-"Revert a file to a previous version by clicking on its revert button" => "변경 버튼을 클릭하여 이전 버전의 파일로 변경할 수 있습니다."
+"File %s could not be reverted to version %s" => "파일 %s을(를) 버전 %s(으)로 되돌리지 못했음",
+"No old versions available" => "오래된 버전을 사용할 수 없음",
+"No path specified" => "경로가 지정되지 않았음",
+"Versions" => "버전",
+"Revert a file to a previous version by clicking on its revert button" => "변경 단추를 눌러 이전 버전의 파일로 되돌릴 수 있습니다"
 );

apps/user_ldap/l10n/es_AR.php

@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Hubo un error al borrar las asignaciones.",
 "Failed to delete the server configuration" => "Fallo al borrar la configuración del servidor",
 "The configuration is valid and the connection could be established!" => "La configuración es válida y la conexión pudo ser establecida.",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuración es válida, pero el enlace falló. Por favor, comprobá la configuración del servidor y las credenciales.",
@@ -7,6 +8,7 @@
 "Take over settings from recent server configuration?" => "Tomar los valores de la anterior configuración de servidor?",
 "Keep settings?" => "¿Mantener preferencias?",
 "Cannot add server configuration" => "No se pudo añadir la configuración del servidor",
+"mappings cleared" => "Asignaciones borradas",
 "Success" => "Éxito",
 "Error" => "Error",
 "Connection test succeeded" => "El este de conexión ha sido completado satisfactoriamente",
@@ -72,6 +74,16 @@
 "Email Field" => "Campo de e-mail",
 "User Home Folder Naming Rule" => "Regla de nombre de los directorios de usuario",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD.",
+"Internal Username" => "Nombre interno de usuario",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Por defecto, el nombre interno de usuario va a ser creado a partir del atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. Para el nombre de usuario interno sólo se pueden usar estos caracteres: [a-zA-Z0-9_.@-]. Otros caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. Si ocurrieran colisiones, un número será añadido o incrementado. El nombre interno de usuario se usa para identificar un usuario internamente. Es también el nombre por defecto para el directorio personal del usuario in ownCloud. También es un puerto de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento por defecto puede ser cambiado. Para conseguir un comportamiento similar al anterior a ownCloud 5, ingresá el atributo del nombre en pantalla del usuario en el siguiente campo. Dejalo vacío para el comportamiento por defecto. Los cambios solo tendrán efecto para los nuevos usuarios LDAP.",
+"Internal Username Attribute:" => "Atributo Nombre Interno de usuario:",
+"Override UUID detection" => "Sobrescribir la detección UUID",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Por defecto, ownCloud detecta automáticamente el atributo UUID. El atributo UUID se usa para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno va a ser creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Podés sobrescribir la configuración y pasar un atributo de tu elección. Tenés que asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Dejalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto sólo en los nuevos usuarios y grupos de LDAP.",
+"UUID Attribute:" => "Atributo UUID:",
+"Username-LDAP User Mapping" => "Asignación del Nombre de usuario de un usuario LDAP",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud usa nombres de usuario para almacenar y asignar (meta) datos. Con el fin de identificar con precisión y reconocer usuarios, cada usuario LDAP tendrá un nombre de usuario interno. Esto requiere una asignación de nombre de usuario de ownCloud a usuario LDAP. El nombre de usuario creado se asigna al UUID del usuario LDAP. Además el DN se almacena en caché principalmente para reducir la interacción de LDAP, pero no se utiliza para la identificación. Si la DN cambia, los cambios serán encontrados por ownCloud. El nombre interno de ownCloud se utiliza para todo en ownCloud. Borrar las asignaciones dejará restos en distintos lugares. Borrar las asignaciones no depende de la configuración, ¡afecta a todas las configuraciones de LDAP! No borrar nunca las asignaciones en un entorno de producción. Sólo borrar asignaciones en una situación de prueba o experimental.",
+"Clear Username-LDAP User Mapping" => "Borrar la asignación de los Nombres de usuario de los usuarios LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Borrar la asignación de los Nombres de grupo de los grupos de LDAP",
 "Test Configuration" => "Probar configuración",
 "Help" => "Ayuda"
 );

apps/user_ldap/l10n/ru.php

@@ -75,10 +75,13 @@
 "User Home Folder Naming Rule" => "Правило именования Домашней Папки Пользователя",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Оставьте имя пользователя пустым (по умолчанию). Иначе укажите атрибут LDAP/AD.",
 "Internal Username" => "Внутреннее имя пользователя",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "По-умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Это необходимо для того, чтобы имя пользователя было уникальным и не содержало в себе запрещенных символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы замещаются соответствиями из таблицы ASCII или же просто пропускаются. При совпадении к имени будет добавлено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по-умолчанию для папки пользователя в ownCloud. Оно также портом для удаленных ссылок, к примеру, для всех сервисов *DAV. С помощию данной настройки можно изменить поведение по-умолчанию. Чтобы достичь поведения, как было настроено до изменения, ownCloud 5 выводит атрибут имени пользователя в этом поле. Оставьте его пустым для режима по-умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP.",
 "Internal Username Attribute:" => "Аттрибут для внутреннего имени:",
 "Override UUID detection" => "Переопределить нахождение UUID",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "По-умолчанию, ownCloud определяет атрибут UUID автоматически. Этот атрибут используется для того, чтобы достоверно индентифицировать пользователей и группы LDAP. Также, на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по-умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP.",
 "UUID Attribute:" => "Аттрибут для UUID:",
 "Username-LDAP User Mapping" => "Соответствия Имя-Пользователь LDAP",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud использует имена пользователей для хранения и назначения метаданных. Для точной идентификации и распознавания пользователей, каждый пользователь LDAP будет иметь свое внутреннее имя пользователя. Это требует наличия соответствия имени пользователя ownCloud к пользователю LDAP. При создании имя пользователя назначается идентификатору UUID пользователя LDAP. Помимо этого кэшируется доменное имя (DN) для снижения взаимодействия LDAP, однако оно не используется для идентификации. Если доменное имя было изменено, об этом станет известно ownCloud. Внутреннее имя ownCloud используется повсеместно в ownCloud. При очистке соответствий повсюду будут оставаться \"хвосты\". Очистка соответствий не привязана к конкретной конфигурации, она влияет на все конфигурации LDAP! Никогда не очищайте соответствия в рабочем окружении. Очищайте соответствия только во время тестов или в экспериментальных конфигурациях.",
 "Clear Username-LDAP User Mapping" => "Очистить соответствия Имя-Пользователь LDAP",
 "Clear Groupname-LDAP Group Mapping" => "Очистить соответствия Группа-Группа LDAP",
 "Test Configuration" => "Тестовая конфигурация",

apps/user_ldap/l10n/sk_SK.php

@@ -79,6 +79,9 @@
 "Internal Username Attribute:" => "Atribút interného používateľského mena:",
 "Override UUID detection" => "Prepísať UUID detekciu",
 "UUID Attribute:" => "UUID atribút:",
+"Username-LDAP User Mapping" => "Mapovanie názvov LDAP používateľských mien",
+"Clear Username-LDAP User Mapping" => "Zrušiť mapovanie LDAP používateľských mien",
+"Clear Groupname-LDAP Group Mapping" => "Zrušiť mapovanie názvov LDAP skupín",
 "Test Configuration" => "Test nastavenia",
 "Help" => "Pomoc"
 );

apps/user_webdavauth/l10n/de_DE.php

@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV-Authentifizierung",
+"URL: " => "URL:",
 "ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud sendet die Benutzerdaten an diese URL. Dieses Plugin prüft die Antwort und wird die Statuscodes 401 und 403 als ungültige Daten und alle anderen Antworten als gültige Daten interpretieren."
 );

apps/user_webdavauth/l10n/el.php

@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Αυθεντικοποίηση μέσω WebDAV ",
+"URL: " => "URL:",
 "ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Το ownCloud θα στείλει τα διαπιστευτήρια  χρήστη σε αυτό το URL. Αυτό το plugin ελέγχει την απάντηση και την μετατρέπει σε HTTP κωδικό κατάστασης 401 και 403 για μη έγκυρα, όλες οι υπόλοιπες απαντήσεις είναι έγκυρες."
 );

apps/user_webdavauth/l10n/es_AR.php

@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Autenticación de WevDAV",
+"URL: " => "URL: ",
 "ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "onwCloud enviará las credenciales de usuario a esta URL. Este complemento verifica la respuesta e interpretará los códigos de respuesta HTTP 401 y 403 como credenciales inválidas y todas las otras respuestas como credenciales válidas."
 );

apps/user_webdavauth/l10n/pt_BR.php

@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Autenticação WebDAV",
+"URL: " => "URL:",
 "ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "O ownCloud enviará as credenciais do usuário para esta URL. Este plugin verifica a resposta e interpreta o os códigos de status do HTTP 401 e 403 como credenciais inválidas, e todas as outras respostas como credenciais válidas."
 );

apps/user_webdavauth/l10n/sk_SK.php

@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV overenie",
+"URL: " => "URL: ",
 "ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud odošle používateľské údaje na zadanú URL. Plugin skontroluje odpoveď a považuje návratovú hodnotu HTTP 401 a 403 za neplatné údaje a všetky ostatné hodnoty ako platné prihlasovacie údaje."
 );

apps/user_webdavauth/user_webdavauth.php

@@ -56,10 +56,10 @@ class OC_USER_WEBDAVAUTH extends OC_User_Backend {
 		}
 		$returncode= substr($headers[0], 9, 3);
 
-		if(($returncode=='401') or ($returncode=='403')) {
-			return(false);
-		}else{
-			return($uid);
+		if(substr($returncode, 0, 1) === '2') {
+			return $uid;
+		} else {
+			return false;
 		}
 
 	}

core/css/jquery.multiselect.css

@@ -11,7 +11,7 @@
 .ui-multiselect-header span.ui-icon { float:left }
 .ui-multiselect-header li.ui-multiselect-close { float:right; text-align:right; padding-right:0 }
 
-.ui-multiselect-menu { display:none; padding:3px; position:absolute; z-index:10000 }
+.ui-multiselect-menu { display:none; padding:3px; position:absolute; z-index:10000; text-align: left }
 .ui-multiselect-checkboxes { position:relative /* fixes bug in IE6/7 */; overflow-y:scroll }
 .ui-multiselect-checkboxes label { cursor:default; display:block; border:1px solid transparent; padding:3px 1px }
 .ui-multiselect-checkboxes label input { position:relative; top:1px }

core/js/config.php

@@ -26,8 +26,6 @@ $array = array(
 	"oc_debug" => (defined('DEBUG') && DEBUG) ? 'true' : 'false',
 	"oc_webroot" => "\"".OC::$WEBROOT."\"",
 	"oc_appswebroots" =>  str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution
-	"oc_current_user" => "document.getElementsByTagName('head')[0].getAttribute('data-user')",
-	"oc_requesttoken" => "document.getElementsByTagName('head')[0].getAttribute('data-requesttoken')",
 	"datepickerFormatDate" => json_encode($l->l('jsdate', 'jsdate')),
 	"dayNames" =>  json_encode(
 		array(

core/js/jquery.multiselect.js

@@ -1,6 +1,7 @@
+/* jshint forin:true, noarg:true, noempty:true, eqeqeq:true, boss:true, undef:true, curly:true, browser:true, jquery:true */
 /*
- * jQuery MultiSelect UI Widget 1.11
- * Copyright (c) 2011 Eric Hynds
+ * jQuery MultiSelect UI Widget 1.13
+ * Copyright (c) 2012 Eric Hynds
  *
  * http://www.erichynds.com/jquery/jquery-ui-multiselect-widget/
  *
@@ -34,8 +35,8 @@ $.widget("ech.multiselect", {
 		noneSelectedText: 'Select options',
 		selectedText: '# selected',
 		selectedList: 0,
-		show: '',
-		hide: '',
+		show: null,
+		hide: null,
 		autoOpen: false,
 		multiple: true,
 		position: {}
@@ -62,7 +63,7 @@ $.widget("ech.multiselect", {
 			menu = (this.menu = $('<div />'))
 				.addClass('ui-multiselect-menu ui-widget ui-widget-content ui-corner-all')
 				.addClass( o.classes )
-				.insertAfter( button ),
+				.appendTo( document.body ),
 
 			header = (this.header = $('<div />'))
 				.addClass('ui-widget-header ui-corner-all ui-multiselect-header ui-helper-clearfix')
@@ -119,70 +120,72 @@ $.widget("ech.multiselect", {
 			menu = this.menu,
 			checkboxContainer = this.checkboxContainer,
 			optgroups = [],
-			html = [],
+			html = "",
 			id = el.attr('id') || multiselectID++; // unique ID for the label & option tags
 
 		// build items
-		this.element.find('option').each(function( i ){
+		el.find('option').each(function( i ){
 			var $this = $(this),
 				parent = this.parentNode,
 				title = this.innerHTML,
 				description = this.title,
 				value = this.value,
-				inputID = this.id || 'ui-multiselect-'+id+'-option-'+i,
+				inputID = 'ui-multiselect-' + (this.id || id + '-option-' + i),
 				isDisabled = this.disabled,
 				isSelected = this.selected,
-				labelClasses = ['ui-corner-all'],
+				labelClasses = [ 'ui-corner-all' ],
+				liClasses = (isDisabled ? 'ui-multiselect-disabled ' : ' ') + this.className,
 				optLabel;
 
 			// is this an optgroup?
-			if( parent.tagName.toLowerCase() === 'optgroup' ){
-				optLabel = parent.getAttribute('label');
+			if( parent.tagName === 'OPTGROUP' ){
+				optLabel = parent.getAttribute( 'label' );
 
 				// has this optgroup been added already?
 				if( $.inArray(optLabel, optgroups) === -1 ){
-					html.push('<li class="ui-multiselect-optgroup-label"><a href="#">' + optLabel + '</a></li>');
+					html += '<li class="ui-multiselect-optgroup-label ' + parent.className + '"><a href="#">' + optLabel + '</a></li>';
 					optgroups.push( optLabel );
 				}
 			}
 
 			if( isDisabled ){
-				labelClasses.push('ui-state-disabled');
+				labelClasses.push( 'ui-state-disabled' );
 			}
 
 			// browsers automatically select the first option
 			// by default with single selects
 			if( isSelected && !o.multiple ){
-				labelClasses.push('ui-state-active');
+				labelClasses.push( 'ui-state-active' );
 			}
 
-			html.push('<li class="' + (isDisabled ? 'ui-multiselect-disabled' : '') + '">');
+			html += '<li class="' + liClasses + '">';
 
 			// create the label
-			html.push('<label for="'+inputID+'" title="'+description+'" class="'+labelClasses.join(' ')+ '">');
-			html.push('<input id="'+inputID+'" name="multiselect_'+id+'" type="'+(o.multiple ? "checkbox" : "radio")+'" value="'+value+'" title="'+title+'"');
+			html += '<label for="' + inputID + '" title="' + description + '" class="' + labelClasses.join(' ') + '">';
+			html += '<input id="' + inputID + '" name="multiselect_' + id + '" type="' + (o.multiple ? "checkbox" : "radio") + '" value="' + value + '" title="' + title + '"';
 
 			// pre-selected?
 			if( isSelected ){
-				html.push(' checked="checked"');
-				html.push(' aria-selected="true"');
+				html += ' checked="checked"';
+				html += ' aria-selected="true"';
 			}
 
 			// disabled?
 			if( isDisabled ){
-				html.push(' disabled="disabled"');
-				html.push(' aria-disabled="true"');
+				html += ' disabled="disabled"';
+				html += ' aria-disabled="true"';
 			}
 
 			// add the title and close everything off
-			html.push(' /><span>' + title + '</span></label></li>');
+			html += ' /><span>' + title + '</span></label></li>';
 		});
 
 		// insert into the DOM
-		checkboxContainer.html( html.join('') );
+		checkboxContainer.html( html );
 
 		// cache some moar useful elements
 		this.labels = menu.find('label');
+		this.inputs = this.labels.children('input');
 
 		// set widths
 		this._setButtonWidth();
@@ -197,10 +200,10 @@ $.widget("ech.multiselect", {
 		}
 	},
 
-	// updates the button text.  call refresh() to rebuild
+	// updates the button text. call refresh() to rebuild
 	update: function(){
 		var o = this.options,
-			$inputs = this.labels.find('input'),
+			$inputs = this.inputs,
 			$checked = $inputs.filter(':checked'),
 			numChecked = $checked.length,
 			value;
@@ -211,7 +214,7 @@ $.widget("ech.multiselect", {
 			if($.isFunction( o.selectedText )){
 				value = o.selectedText.call(this, numChecked, $inputs.length, $checked.get());
 			} else if( /\d/.test(o.selectedList) && o.selectedList > 0 && numChecked <= o.selectedList){
-				value = $checked.map(function(){ return this.title; }).get().join(', ');
+				value = $checked.map(function(){ return $(this).next().html(); }).get().join(', ');
 			} else {
 				value = o.selectedText.replace('#', numChecked).replace('#', $inputs.length);
 			}
@@ -291,8 +294,8 @@ $.widget("ech.multiselect", {
 
 				var $this = $(this),
 					$inputs = $this.parent().nextUntil('li.ui-multiselect-optgroup-label').find('input:visible:not(:disabled)'),
-				    nodes = $inputs.get(),
-				    label = $this.parent().text();
+					nodes = $inputs.get(),
+					label = $this.parent().text();
 
 				// trigger event and bail if the return is false
 				if( self._trigger('beforeoptgrouptoggle', e, { inputs:nodes, label:label }) === false ){
@@ -343,11 +346,15 @@ $.widget("ech.multiselect", {
 					tags = self.element.find('option');
 
 				// bail if this input is disabled or the event is cancelled
-				if( this.disabled || self._trigger('click', e, { value:val, text:this.title, checked:checked }) === false ){
+				if( this.disabled || self._trigger('click', e, { value: val, text: this.title, checked: checked }) === false ){
 					e.preventDefault();
 					return;
 				}
 
+				// make sure the input has focus. otherwise, the esc key
+				// won't close the menu after clicking an item.
+				$this.focus();
+
 				// toggle aria state
 				$this.attr('aria-selected', checked);
 
@@ -389,7 +396,7 @@ $.widget("ech.multiselect", {
 		// handler fires before the form is actually reset.  delaying it a bit
 		// gives the form inputs time to clear.
 		$(this.element[0].form).bind('reset.multiselect', function(){
-			setTimeout(function(){ self.update(); }, 10);
+			setTimeout($.proxy(self.refresh, self), 10);
 		});
 	},
 
@@ -428,7 +435,7 @@ $.widget("ech.multiselect", {
 
 		// if at the first/last element
 		if( !$next.length ){
-			var $container = this.menu.find('ul:last');
+			var $container = this.menu.find('ul').last();
 
 			// move to the first/last
 			this.menu.find('label')[ moveToLast ? 'last' : 'first' ]().trigger('mouseover');
@@ -445,27 +452,29 @@ $.widget("ech.multiselect", {
 	// other related attributes of a checkbox.
 	//
 	// The context of this function should be a checkbox; do not proxy it.
-	_toggleCheckbox: function( prop, flag ){
+	_toggleState: function( prop, flag ){
 		return function(){
-			!this.disabled && (this[ prop ] = flag);
+			if( !this.disabled ) {
+				this[ prop ] = flag;
+			}
 
 			if( flag ){
 				this.setAttribute('aria-selected', true);
 			} else {
 				this.removeAttribute('aria-selected');
 			}
-		}
+		};
 	},
 
 	_toggleChecked: function( flag, group ){
-		var $inputs = (group && group.length) ?
-			group :
-			this.labels.find('input'),
-
+		var $inputs = (group && group.length) ?  group : this.inputs,
 			self = this;
 
 		// toggle state on inputs
-		$inputs.each(this._toggleCheckbox('checked', flag));
+		$inputs.each(this._toggleState('checked', flag));
+
+		// give the first input focus
+		$inputs.eq(0).focus();
 
 		// update button text
 		this.update();
@@ -480,7 +489,7 @@ $.widget("ech.multiselect", {
 			.find('option')
 			.each(function(){
 				if( !this.disabled && $.inArray(this.value, values) > -1 ){
-					self._toggleCheckbox('selected', flag).call( this );
+					self._toggleState('selected', flag).call( this );
 				}
 			});
 
@@ -494,9 +503,22 @@ $.widget("ech.multiselect", {
 		this.button
 			.attr({ 'disabled':flag, 'aria-disabled':flag })[ flag ? 'addClass' : 'removeClass' ]('ui-state-disabled');
 
-		this.menu
-			.find('input')
-			.attr({ 'disabled':flag, 'aria-disabled':flag })
+		var inputs = this.menu.find('input');
+		var key = "ech-multiselect-disabled";
+
+		if(flag) {
+			// remember which elements this widget disabled (not pre-disabled)
+			// elements, so that they can be restored if the widget is re-enabled.
+			inputs = inputs.filter(':enabled')
+				.data(key, true)
+		} else {
+			inputs = inputs.filter(function() {
+				return $.data(this, key) === true;
+			}).removeData(key);
+		}
+
+		inputs
+			.attr({ 'disabled':flag, 'arial-disabled':flag })
 			.parent()[ flag ? 'addClass' : 'removeClass' ]('ui-state-disabled');
 
 		this.element
@@ -509,16 +531,17 @@ $.widget("ech.multiselect", {
 			button = this.button,
 			menu = this.menu,
 			speed = this.speed,
-			o = this.options;
+			o = this.options,
+			args = [];
 
 		// bail if the multiselectopen event returns false, this widget is disabled, or is already open
 		if( this._trigger('beforeopen') === false || button.hasClass('ui-state-disabled') || this._isOpen ){
 			return;
 		}
 
-		var $container = menu.find('ul:last'),
+		var $container = menu.find('ul').last(),
 			effect = o.show,
-			pos = button.position();
+			pos = button.offset();
 
 		// figure out opening effects/speeds
 		if( $.isArray(o.show) ){
@@ -526,6 +549,12 @@ $.widget("ech.multiselect", {
 			speed = o.show[1] || self.speed;
 		}
 
+		// if there's an effect, assume jQuery UI is in use
+		// build the arguments to pass to show()
+		if( effect ) {
+      args = [ effect, speed ];
+		}
+
 		// set the scroll of the checkbox container
 		$container.scrollTop(0).height(o.height);
 
@@ -536,17 +565,19 @@ $.widget("ech.multiselect", {
 			menu
 				.show()
 				.position( o.position )
-				.hide()
-				.show( effect, speed );
+				.hide();
 
 		// if position utility is not available...
 		} else {
 			menu.css({
-				top: pos.top+button.outerHeight(),
+				top: pos.top + button.outerHeight(),
 				left: pos.left
-			}).show( effect, speed );
+			});
 		}
 
+		// show the menu, maybe with a speed/effect combo
+		$.fn.show.apply(menu, args);
+
 		// select the first option
 		// triggering both mouseover and mouseover because 1.4.2+ has a bug where triggering mouseover
 		// will actually trigger mouseenter.  the mouseenter trigger is there for when it's eventually fixed
@@ -563,7 +594,10 @@ $.widget("ech.multiselect", {
 			return;
 		}
 
-		var o = this.options, effect = o.hide, speed = this.speed;
+		var o = this.options,
+		    effect = o.hide,
+		    speed = this.speed,
+		    args = [];
 
 		// figure out opening effects/speeds
 		if( $.isArray(o.hide) ){
@@ -571,7 +605,11 @@ $.widget("ech.multiselect", {
 			speed = o.hide[1] || this.speed;
 		}
 
-		this.menu.hide(effect, speed);
+    if( effect ) {
+      args = [ effect, speed ];
+    }
+
+    $.fn.hide.apply(this.menu, args);
 		this.button.removeClass('ui-state-active').trigger('blur').trigger('mouseleave');
 		this._isOpen = false;
 		this._trigger('close');
@@ -618,6 +656,10 @@ $.widget("ech.multiselect", {
 		return this.menu;
 	},
 
+	getButton: function(){
+	  return this.button;
+  },
+
 	// react to option changes after initialization
 	_setOption: function( key, value ){
 		var menu = this.menu;
@@ -633,7 +675,7 @@ $.widget("ech.multiselect", {
 				menu.find('a.ui-multiselect-none span').eq(-1).text(value);
 				break;
 			case 'height':
-				menu.find('ul:last').height( parseInt(value,10) );
+				menu.find('ul').last().height( parseInt(value,10) );
 				break;
 			case 'minWidth':
 				this.options[ key ] = parseInt(value,10);
@@ -649,6 +691,11 @@ $.widget("ech.multiselect", {
 			case 'classes':
 				menu.add(this.button).removeClass(this.options.classes).addClass(value);
 				break;
+			case 'multiple':
+				menu.toggleClass('ui-multiselect-single', !value);
+				this.options.multiple = value;
+				this.element[0].multiple = value;
+				this.refresh();
 		}
 
 		$.Widget.prototype._setOption.apply( this, arguments );

core/js/js.js

@@ -7,7 +7,10 @@
  */
 var oc_debug;
 var oc_webroot;
-var oc_requesttoken;
+
+var oc_current_user = document.getElementsByTagName('head')[0].getAttribute('data-user');
+var oc_requesttoken = document.getElementsByTagName('head')[0].getAttribute('data-requesttoken');
+
 if (typeof oc_webroot === "undefined") {
 	oc_webroot = location.pathname.substr(0, location.pathname.lastIndexOf('/'));
 }

core/l10n/ca.php

@@ -90,7 +90,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "La petició ha fallat!<br>Esteu segur que el correu/nom d'usuari és correcte?",
 "You will receive a link to reset your password via Email." => "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.",
 "Username" => "Nom d'usuari",
-"Your files seems to be encrypted. If you didn't have enabled the recovery key there will be no way to get your data back once the password was resetted. If you are not sure what to do, please contact your administrator first before continue. Do you really want to continue?" => "Els vostres fitxers sembla que estan encriptats. Si no tenieu habilitada la clau de recuperació no hi haurà manera de recuperar les dades quan reestabliu la contrasenya. Si no sabeu què fer, contacteu amb l'administrador abans de continuar. Voleu continuar?",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. Si sabeu què fer, contacteu amb l'administrador abans de continuar. Voleu continuar?",
 "Yes, I really want to reset my password now" => "Sí, vull restablir ara la contrasenya",
 "Request reset" => "Sol·licita reinicialització",
 "Your password was reset" => "La vostra contrasenya s'ha reinicialitzat",

core/l10n/cs_CZ.php

@@ -90,7 +90,6 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Požadavek selhal.<br>Ujistili jste se, že vaše uživatelské jméno a e-mail jsou správně?",
 "You will receive a link to reset your password via Email." => "Bude Vám e-mailem zaslán odkaz pro obnovu hesla.",
 "Username" => "Uživatelské jméno",
-"Your files seems to be encrypted. If you didn't have enabled the recovery key there will be no way to get your data back once the password was resetted. If you are not sure what to do, please contact your administrator first before continue. Do you really want to continue?" => "Vaše soubory jsou šifrovány. Pokud nemáte povolen klíč obnovy, neexistuje způsob jak získat po obnově hesla vaše data. Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce. Opravdu si přejete pokračovat?",
 "Yes, I really want to reset my password now" => "Ano, opravdu si nyní přeji obnovit své heslo",
 "Request reset" => "Vyžádat obnovu",
 "Your password was reset" => "Vaše heslo bylo obnoveno",

core/l10n/de_DE.php

@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s geteilt »%s« mit Ihnen",
 "Category type not provided." => "Kategorie nicht angegeben.",
 "No category to add?" => "Keine Kategorie hinzuzufügen?",
 "This category already exists: %s" => "Die nachfolgende Kategorie existiert bereits: %s",
@@ -89,6 +90,8 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adresse/Nutzername korrekt waren?",
 "You will receive a link to reset your password via Email." => "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
 "Username" => "Benutzername",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keinen Weg geben, um Ihre Daten wieder zu bekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
+"Yes, I really want to reset my password now" => "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.",
 "Request reset" => "Zurücksetzung anfordern",
 "Your password was reset" => "Ihr Passwort wurde zurückgesetzt.",
 "To login page" => "Zur Login-Seite",
@@ -101,6 +104,7 @@
 "Help" => "Hilfe",
 "Access forbidden" => "Zugriff verboten",
 "Cloud not found" => "Cloud wurde nicht gefunden",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo,\n\nich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.\nSchauen Sie es sich an: %s\n\nViele Grüße!",
 "web services under your control" => "Web-Services unter Ihrer Kontrolle",
 "Edit categories" => "Kategorien ändern",
 "Add" => "Hinzufügen",
@@ -131,6 +135,7 @@
 "remember" => "merken",
 "Log in" => "Einloggen",
 "Alternative Logins" => "Alternative Logins",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo,<br><br>ich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.<br><a href=\"%s\">Schauen Sie es sich an!</a><br><br>Viele Grüße!",
 "prev" => "Zurück",
 "next" => "Weiter",
 "Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."

core/l10n/el.php

@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "Ο %s διαμοιράστηκε μαζί σας το »%s«",
 "Category type not provided." => "Δεν δώθηκε τύπος κατηγορίας.",
 "No category to add?" => "Δεν έχετε κατηγορία να προσθέσετε;",
 "This category already exists: %s" => "Αυτή η κατηγορία υπάρχει ήδη: %s",
@@ -88,6 +89,8 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Η αίτηση απέτυχε! Βεβαιωθηκατε ότι το email σας / username ειναι σωστο? ",
 "You will receive a link to reset your password via Email." => "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.",
 "Username" => "Όνομα χρήστη",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί ανάκτησης, δεν υπάρχει περίπτωση να έχετε πρόσβαση στα δεδομένα σας μετά την επαναφορά του συνθηματικού. Εάν δεν είστε σίγουροι τι να κάνετε, παρακαλώ επικοινωνήστε με τον διαχειριστή πριν συνεχίσετε. Θέλετε να συνεχίσετε;",
+"Yes, I really want to reset my password now" => "Ναι, θέλω να επαναφέρω το συνθηματικό μου τώρα.",
 "Request reset" => "Επαναφορά αίτησης",
 "Your password was reset" => "Ο κωδικός πρόσβασής σας επαναφέρθηκε",
 "To login page" => "Σελίδα εισόδου",
@@ -100,6 +103,7 @@
 "Help" => "Βοήθεια",
 "Access forbidden" => "Δεν επιτρέπεται η πρόσβαση",
 "Cloud not found" => "Δεν βρέθηκε νέφος",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Γεια σας,\n\nσας ενημερώνουμε ότι ο %s διαμοιράστηκε μαζί σας το %s.\nΔείτε το: %s\n\nΓεια χαρά!",
 "web services under your control" => "υπηρεσίες δικτύου υπό τον έλεγχό σας",
 "Edit categories" => "Επεξεργασία κατηγοριών",
 "Add" => "Προσθήκη",
@@ -130,6 +134,7 @@
 "remember" => "απομνημόνευση",
 "Log in" => "Είσοδος",
 "Alternative Logins" => "Εναλλακτικές Συνδέσεις",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Γεια σας,<br><br>σας ενημερώνουμε ότι ο %s διαμοιράστηκε μαζί σας το »%s«.<br><a href=\"%s\">Δείτε το!</a><br><br>Γεια χαρά!",
 "prev" => "προηγούμενο",
 "next" => "επόμενο",
 "Updating ownCloud to version %s, this may take a while." => "Ενημερώνοντας το ownCloud στην έκδοση %s,μπορεί να πάρει λίγο χρόνο."

core/l10n/eo.php

@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s kunhavigis “%s” kun vi",
 "Category type not provided." => "Ne proviziĝis tipon de kategorio.",
 "No category to add?" => "Ĉu neniu kategorio estas aldonota?",
 "This category already exists: %s" => "Tiu kategorio jam ekzistas: %s",
@@ -84,8 +85,10 @@
 "The update was successful. Redirecting you to ownCloud now." => "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud.",
 "ownCloud password reset" => "La pasvorto de ownCloud restariĝis.",
 "Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
+"Request failed!<br>Did you make sure your email/username was right?" => "La peto malsukcesis!<br />Ĉu vi certiĝis, ke via retpoŝto/uzantonomo ĝustas?",
 "You will receive a link to reset your password via Email." => "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
 "Username" => "Uzantonomo",
+"Yes, I really want to reset my password now" => "Jes, mi vere volas restarigi mian pasvorton nun",
 "Request reset" => "Peti rekomencigon",
 "Your password was reset" => "Via pasvorto rekomencis",
 "To login page" => "Al la ensaluta paĝo",
@@ -98,11 +101,13 @@
 "Help" => "Helpo",
 "Access forbidden" => "Aliro estas malpermesata",
 "Cloud not found" => "La nubo ne estas trovita",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Saluton:\n\nNi nur sciigas vin, ke %s kunhavigis %s kun vi.\nVidu ĝin: %s\n\nĜis!",
 "web services under your control" => "TTT-servoj regataj de vi",
 "Edit categories" => "Redakti kategoriojn",
 "Add" => "Aldoni",
 "Security Warning" => "Sekureca averto",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Via PHP versio estas sendefenda je la NULL bajto atako (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Bonvolu ĝisdatigi vian instalon de PHP por uzi ownCloud-on sekure.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ne disponeblas sekura generilo de hazardaj numeroj; bonvolu kapabligi la OpenSSL-kromaĵon por PHP.",
 "Create an <strong>admin account</strong>" => "Krei <strong>administran konton</strong>",
 "Advanced" => "Progresinta",
@@ -115,12 +120,17 @@
 "Database tablespace" => "Datumbaza tabelospaco",
 "Database host" => "Datumbaza gastigo",
 "Finish setup" => "Fini la instalon",
+"%s is available. Get more information on how to update." => "%s haveblas. Ekhavi pli da informo pri kiel ĝisdatigi.",
 "Log out" => "Elsaluti",
+"Automatic logon rejected!" => "La aŭtomata ensaluto malakceptiĝis!",
 "If you did not change your password recently, your account may be compromised!" => "Se vi ne ŝanĝis vian pasvorton lastatempe, via konto eble kompromitas!",
 "Please change your password to secure your account again." => "Bonvolu ŝanĝi vian pasvorton por sekurigi vian konton ree.",
 "Lost your password?" => "Ĉu vi perdis vian pasvorton?",
 "remember" => "memori",
 "Log in" => "Ensaluti",
+"Alternative Logins" => "Alternativaj ensalutoj",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Saluton:<br /><br />Ni nur sciigas vin, ke %s kunhavigis “%s” kun vi.<br /><a href=\"%s\">Vidu ĝin</a><br /><br />Ĝis!",
 "prev" => "maljena",
-"next" => "jena"
+"next" => "jena",
+"Updating ownCloud to version %s, this may take a while." => "ownCloud ĝisdatiĝas al eldono %s, tio ĉi povas daŭri je iom da tempo."
 );

core/l10n/es.php

@@ -90,7 +90,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "La petición ha fallado! <br> ¿Está seguro de que su dirección de correo electrónico o nombre de usuario era correcto?",
 "You will receive a link to reset your password via Email." => "Recibirá un enlace por correo electrónico para restablecer su contraseña",
 "Username" => "Nombre de usuario",
-"Your files seems to be encrypted. If you didn't have enabled the recovery key there will be no way to get your data back once the password was resetted. If you are not sure what to do, please contact your administrator first before continue. Do you really want to continue?" => "Sus archivos parecen estar encriptados. Si no ha habilitado la clave de recurperación, no habrá ninguna manera de recuperar sus datos hasta que la contraseña sea reseteada. Si no está seguro de qué hacer, por favor contacte con su administrador antes de continuar. ¿Desea realmente continuar?",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?",
 "Yes, I really want to reset my password now" => "Sí. Realmente deseo resetear mi contraseña ahora",
 "Request reset" => "Solicitar restablecimiento",
 "Your password was reset" => "Su contraseña ha sido establecida",

core/l10n/es_AR.php

@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s compartió \"%s\" con vos",
 "Category type not provided." => "Tipo de categoría no provisto. ",
 "No category to add?" => "¿Ninguna categoría para añadir?",
 "This category already exists: %s" => "Esta categoría ya existe: %s",
@@ -6,7 +7,7 @@
 "%s ID not provided." => "%s ID no provista. ",
 "Error adding %s to favorites." => "Error al agregar %s a favoritos. ",
 "No categories selected for deletion." => "No se seleccionaron categorías para borrar.",
-"Error removing %s from favorites." => "Error al remover %s de favoritos. ",
+"Error removing %s from favorites." => "Error al borrar %s de favoritos. ",
 "Sunday" => "Domingo",
 "Monday" => "Lunes",
 "Tuesday" => "Martes",
@@ -31,7 +32,7 @@
 "1 minute ago" => "hace 1 minuto",
 "{minutes} minutes ago" => "hace {minutes} minutos",
 "1 hour ago" => "1 hora atrás",
-"{hours} hours ago" => "{hours} horas atrás",
+"{hours} hours ago" => "hace {hours} horas",
 "today" => "hoy",
 "yesterday" => "ayer",
 "{days} days ago" => "hace {days} días",
@@ -46,49 +47,51 @@
 "Yes" => "Sí",
 "No" => "No",
 "Ok" => "Aceptar",
-"The object type is not specified." => "El tipo de objeto no esta especificado. ",
+"The object type is not specified." => "El tipo de objeto no está especificado. ",
 "Error" => "Error",
-"The app name is not specified." => "El nombre de la aplicación no esta especificado.",
+"The app name is not specified." => "El nombre de la App no está especificado.",
 "The required file {file} is not installed!" => "¡El archivo requerido {file} no está instalado!",
 "Shared" => "Compartido",
 "Share" => "Compartir",
 "Error while sharing" => "Error al compartir",
-"Error while unsharing" => "Error en el procedimiento de ",
+"Error while unsharing" => "Error en al dejar de compartir",
 "Error while changing permissions" => "Error al cambiar permisos",
 "Shared with you and the group {group} by {owner}" => "Compartido con vos y el grupo {group} por {owner}",
 "Shared with you by {owner}" => "Compartido con vos por {owner}",
 "Share with" => "Compartir con",
-"Share with link" => "Compartir con link",
+"Share with link" => "Compartir con enlace",
 "Password protect" => "Proteger con contraseña ",
 "Password" => "Contraseña",
-"Email link to person" => "Enviar el link por e-mail.",
-"Send" => "Enviar",
+"Email link to person" => "Enviar el enlace por e-mail.",
+"Send" => "Mandar",
 "Set expiration date" => "Asignar fecha de vencimiento",
 "Expiration date" => "Fecha de vencimiento",
-"Share via email:" => "compartido a través de e-mail:",
+"Share via email:" => "Compartir a través de e-mail:",
 "No people found" => "No se encontraron usuarios",
 "Resharing is not allowed" => "No se permite volver a compartir",
 "Shared in {item} with {user}" => "Compartido en {item} con {user}",
 "Unshare" => "Dejar de compartir",
-"can edit" => "puede editar",
+"can edit" => "podés editar",
 "access control" => "control de acceso",
 "create" => "crear",
 "update" => "actualizar",
 "delete" => "borrar",
 "share" => "compartir",
 "Password protected" => "Protegido por contraseña",
-"Error unsetting expiration date" => "Error al remover la fecha de caducidad",
+"Error unsetting expiration date" => "Error al remover la fecha de vencimiento",
 "Error setting expiration date" => "Error al asignar fecha de vencimiento",
-"Sending ..." => "Enviando...",
-"Email sent" => "Email enviado",
+"Sending ..." => "Mandando...",
+"Email sent" => "e-mail mandado",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización no pudo ser completada. Por favor, reportá el inconveniente a la comunidad <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "La actualización fue exitosa. Estás siendo redirigido a ownCloud.",
 "ownCloud password reset" => "Restablecer contraseña de ownCloud",
 "Use the following link to reset your password: {link}" => "Usá este enlace para restablecer tu contraseña: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "El enlace para restablecer la contraseña fue enviada a tu correo electrónico. <br> Si no lo recibís en un plazo de tiempo razonable,  revisá tu carpeta de spam / correo no deseado. <br> Si no está ahí, preguntale a tu administrador.",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "El enlace para restablecer la contraseña fue enviada a tu e-mail. <br> Si no lo recibís en un plazo de tiempo razonable,  revisá tu carpeta de spam / correo no deseado. <br> Si no está ahí, preguntale a tu administrador.",
 "Request failed!<br>Did you make sure your email/username was right?" => "¡Error en el pedido! <br> ¿Estás seguro de que tu dirección de correo electrónico o nombre de usuario son correcto?",
-"You will receive a link to reset your password via Email." => "Vas a recibir un enlace por e-mail para restablecer tu contraseña",
+"You will receive a link to reset your password via Email." => "Vas a recibir un enlace por e-mail para restablecer tu contraseña.",
 "Username" => "Nombre de usuario",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Tus archivos están encriptados. Si no habilitaste la clave de recuperación, no vas a tener manera de obtener nuevamente tus datos después que se restablezca tu contraseña. Si no estás seguro sobre qué hacer, ponete en contacto con el administrador antes de seguir. ¿Estás seguro/a que querés continuar?",
+"Yes, I really want to reset my password now" => "Sí, definitivamente quiero restablecer mi contraseña ahora",
 "Request reset" => "Solicitar restablecimiento",
 "Your password was reset" => "Tu contraseña fue restablecida",
 "To login page" => "A la página de inicio de sesión",
@@ -96,42 +99,44 @@
 "Reset password" => "Restablecer contraseña",
 "Personal" => "Personal",
 "Users" => "Usuarios",
-"Apps" => "Aplicaciones",
+"Apps" => "Apps",
 "Admin" => "Administración",
 "Help" => "Ayuda",
-"Access forbidden" => "Acceso denegado",
+"Access forbidden" => "Acceso prohibido",
 "Cloud not found" => "No se encontró ownCloud",
-"web services under your control" => "servicios web controlados por vos",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hola,\n\nSimplemente te informo que %s compartió %s con vos.\nMiralo acá: %s\n\n¡Chau!",
+"web services under your control" => "servicios web que controlás",
 "Edit categories" => "Editar categorías",
 "Add" => "Agregar",
 "Security Warning" => "Advertencia de seguridad",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La versión de PHP que tenés, es vulnerable al ataque de byte NULL (CVE-2006-7243)",
 "Please update your PHP installation to use ownCloud securely." => "Actualizá tu instalación de PHP para usar ownCloud de manera segura.",
-"No secure random number generator is available, please enable the PHP OpenSSL extension." => "No hay disponible ningún generador de números aleatorios seguro. Por favor habilitá la extensión OpenSSL de PHP.",
-"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sin un generador de números aleatorios seguro un atacante podría predecir los tokens de reinicio de tu contraseña y tomar control de tu cuenta.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "No hay disponible ningún generador de números aleatorios seguro. Por favor, habilitá la extensión OpenSSL de PHP.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sin un generador de números aleatorios seguro un atacante podría predecir las pruebas de reinicio de tu contraseña y tomar control de tu cuenta.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Tu directorio de datos y tus archivos probablemente son accesibles a través de internet, ya que el archivo .htaccess no está funcionando.",
 "For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Para información sobre cómo configurar adecuadamente tu servidor, por favor mirá la <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentación</a>.",
 "Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
 "Advanced" => "Avanzado",
 "Data folder" => "Directorio de almacenamiento",
 "Configure the database" => "Configurar la base de datos",
-"will be used" => "se utilizarán",
+"will be used" => "se usarán",
 "Database user" => "Usuario de la base de datos",
 "Database password" => "Contraseña de la base de datos",
 "Database name" => "Nombre de la base de datos",
 "Database tablespace" => "Espacio de tablas de la base de datos",
-"Database host" => "Host de la base de datos",
+"Database host" => "Huésped de la base de datos",
 "Finish setup" => "Completar la instalación",
 "%s is available. Get more information on how to update." => "%s está disponible. Obtené más información sobre cómo actualizar.",
 "Log out" => "Cerrar la sesión",
 "Automatic logon rejected!" => "¡El inicio de sesión automático fue rechazado!",
 "If you did not change your password recently, your account may be compromised!" => "¡Si no cambiaste tu contraseña recientemente, puede ser que tu cuenta esté comprometida!",
-"Please change your password to secure your account again." => "Por favor, cambiá tu contraseña para fortalecer nuevamente la seguridad de tu cuenta.",
+"Please change your password to secure your account again." => "Por favor, cambiá tu contraseña para incrementar la seguridad de tu cuenta.",
 "Lost your password?" => "¿Perdiste tu contraseña?",
 "remember" => "recordame",
-"Log in" => "Entrar",
+"Log in" => "Iniciar sesión",
 "Alternative Logins" => "Nombre alternativos de usuarios",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hola,<br><br>Simplemente te informo que %s compartió %s con vos.<br><a href=\"%s\">Miralo acá:</a><br><br>¡Chau!",
 "prev" => "anterior",
 "next" => "siguiente",
-"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, puede domorar un rato."
+"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, puede demorar un rato."
 );

core/l10n/fi_FI.php

@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s jakoi kohteen »%s« kanssasi",
 "Category type not provided." => "Luokan tyyppiä ei määritelty.",
 "No category to add?" => "Ei lisättävää luokkaa?",
 "This category already exists: %s" => "Luokka on jo olemassa: %s",
@@ -83,6 +84,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Pyyntö epäonnistui!<br>Olihan sähköpostiosoitteesi/käyttäjätunnuksesi oikein?",
 "You will receive a link to reset your password via Email." => "Saat sähköpostitse linkin nollataksesi salasanan.",
 "Username" => "Käyttäjätunnus",
+"Yes, I really want to reset my password now" => "Kyllä, haluan nollata salasanani nyt",
 "Request reset" => "Tilaus lähetetty",
 "Your password was reset" => "Salasanasi nollattiin",
 "To login page" => "Kirjautumissivulle",
@@ -95,6 +97,7 @@
 "Help" => "Ohje",
 "Access forbidden" => "Pääsy estetty",
 "Cloud not found" => "Pilveä ei löydy",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hei!\n\n%s jakoi kohteen %s kanssasi.\nKatso se tästä: %s\n\nNäkemiin!",
 "web services under your control" => "verkkopalvelut hallinnassasi",
 "Edit categories" => "Muokkaa luokkia",
 "Add" => "Lisää",
@@ -124,6 +127,7 @@
 "remember" => "muista",
 "Log in" => "Kirjaudu sisään",
 "Alternative Logins" => "Vaihtoehtoiset kirjautumiset",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hei!<br><br>%s jakoi kohteen »%s« kanssasi.<br><a href=\"%s\">Katso se tästä!</a><br><br>Näkemiin!",
 "prev" => "edellinen",
 "next" => "seuraava",
 "Updating ownCloud to version %s, this may take a while." => "Päivitetään ownCloud versioon %s, tämä saattaa kestää hetken."

core/l10n/fr.php

@@ -90,7 +90,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Requête en échec!<br>Avez-vous vérifié vos courriel/nom d'utilisateur?",
 "You will receive a link to reset your password via Email." => "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe.",
 "Username" => "Nom d'utilisateur",
-"Your files seems to be encrypted. If you didn't have enabled the recovery key there will be no way to get your data back once the password was resetted. If you are not sure what to do, please contact your administrator first before continue. Do you really want to continue?" => "Vos fichiers semblent être cryptés. Si vous n'aviez pas activé la clé de récupération il n'y aura aucun moyen de récupérer vos données une fois que le mot de passe aura été réinitialisé. Si vous n'êtes pas certain de ce que vous faites, veuillez d'abord contacter votre administrateur avant de continuer. Êtes-vous sûr de vouloir continuer?",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura plus aucun moyen de récupérer vos données une fois le mot de passe réinitialisé. Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. Voulez-vous vraiment continuer ?",
 "Yes, I really want to reset my password now" => "Oui, je veux vraiment réinitialiser mon mot de passe maintenant",
 "Request reset" => "Demander la réinitialisation",
 "Your password was reset" => "Votre mot de passe a été réinitialisé",

core/l10n/gl.php

@@ -90,7 +90,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Non foi posíbel facer a petición!<br>Asegúrese de que o seu enderezo de correo ou nome de usuario é correcto.",
 "You will receive a link to reset your password via Email." => "Recibirá unha ligazón por correo para restabelecer o contrasinal",
 "Username" => "Nome de usuario",
-"Your files seems to be encrypted. If you didn't have enabled the recovery key there will be no way to get your data back once the password was resetted. If you are not sure what to do, please contact your administrator first before continue. Do you really want to continue?" => "Semella que os ficheiros están cifrados. Se aínda non activou a chave de recuperación non haberá xeito de recuperar os datos unha vez que se teña restabelecido o contrasinal. Se non ten certeza do que ten que facer, póñase en contacto co administrador antes de continuar. Confirma que quere continuar?",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Os ficheiros están cifrados. Se aínda non activou a chave de recuperación non haberá xeito de recuperar os datos unha vez que se teña restabelecido o contrasinal. Se non ten certeza do que ten que facer, póñase en contacto co administrador antes de continuar. Confirma que quere continuar?",
 "Yes, I really want to reset my password now" => "Si, confirmo que quero restabelecer agora o meu contrasinal",
 "Request reset" => "Petición de restabelecemento",
 "Your password was reset" => "O contrasinal foi restabelecido",

core/l10n/hu_HU.php

@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s megosztotta Önnel ezt:  »%s«",
 "Category type not provided." => "Nincs megadva a kategória típusa.",
 "No category to add?" => "Nincs hozzáadandó kategória?",
 "This category already exists: %s" => "Ez a kategória már létezik: %s",
@@ -89,6 +90,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "A kérést nem sikerült teljesíteni! <br>Biztos, hogy jó emailcímet/felhasználónevet adott meg?",
 "You will receive a link to reset your password via Email." => "Egy emailben fog értesítést kapni a jelszóbeállítás módjáról.",
 "Username" => "Felhasználónév",
+"Yes, I really want to reset my password now" => "Igen, tényleg meg akarom változtatni a jelszavam",
 "Request reset" => "Visszaállítás igénylése",
 "Your password was reset" => "Jelszó megváltoztatva",
 "To login page" => "A bejelentkező ablakhoz",
@@ -101,6 +103,7 @@
 "Help" => "Súgó",
 "Access forbidden" => "A hozzáférés nem engedélyezett",
 "Cloud not found" => "A felhő nem található",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Üdv!\n\nÚj hír: %s megosztotta Önnel ezt: %s.\nItt nézhető meg: %s\n\nMinden jót!",
 "web services under your control" => "webszolgáltatások saját kézben",
 "Edit categories" => "Kategóriák szerkesztése",
 "Add" => "Hozzáadás",
@@ -131,6 +134,7 @@
 "remember" => "emlékezzen",
 "Log in" => "Bejelentkezés",
 "Alternative Logins" => "Alternatív bejelentkezés",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Üdv!<br><br>Új hír: %s megosztotta Önnel ezt:  »%s«.<br><a href=\"%s\">Itt nézhető meg!</a><br><br>Minden jót!",
 "prev" => "előző",
 "next" => "következő",
 "Updating ownCloud to version %s, this may take a while." => "Owncloud frissítés a %s verzióra folyamatban. Kis türelmet."

core/l10n/it.php

@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s condiviso »%s« con te",
+"%s shared »%s« with you" => "%s ha condiviso »%s« con te",
 "Category type not provided." => "Tipo di categoria non fornito.",
 "No category to add?" => "Nessuna categoria da aggiungere?",
 "This category already exists: %s" => "Questa categoria esiste già: %s",
@@ -90,8 +90,8 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Richiesta non riuscita!<br>Sei sicuro che l'indirizzo di posta/nome utente fosse corretto?",
 "You will receive a link to reset your password via Email." => "Riceverai un collegamento per ripristinare la tua password via email",
 "Username" => "Nome utente",
-"Your files seems to be encrypted. If you didn't have enabled the recovery key there will be no way to get your data back once the password was resetted. If you are not sure what to do, please contact your administrator first before continue. Do you really want to continue?" => "I file non sembrano essere cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà resettata. Se non sei sicuro, per favore contatta l'amministratore prima di proseguire. Vuoi veramente continuare?",
-"Yes, I really want to reset my password now" => "Sì, voglio davvero resettare la mia password adesso",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "I file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà ripristinata. Se non sei sicuro, per favore contatta l'amministratore prima di proseguire. Vuoi davvero continuare?",
+"Yes, I really want to reset my password now" => "Sì, voglio davvero ripristinare la mia password adesso",
 "Request reset" => "Richiesta di ripristino",
 "Your password was reset" => "La password è stata ripristinata",
 "To login page" => "Alla pagina di accesso",
@@ -104,7 +104,7 @@
 "Help" => "Aiuto",
 "Access forbidden" => "Accesso negato",
 "Cloud not found" => "Nuvola non trovata",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ehilà,\n\nvolevo solamente farti sapere che %s ha condiviso %s con te.\nGuarda: %s\n\nGrazie!",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ehilà,\n\nvolevo solamente farti sapere che %s ha condiviso %s con te.\nGuarda: %s\n\nSaluti!",
 "web services under your control" => "servizi web nelle tue mani",
 "Edit categories" => "Modifica categorie",
 "Add" => "Aggiungi",
@@ -135,7 +135,7 @@
 "remember" => "ricorda",
 "Log in" => "Accedi",
 "Alternative Logins" => "Accessi alternativi",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ehilà,<br><br>volevo solamente farti sapere che %s ha condiviso »%s« con te.<br><a href=\"%s\">Guarda!</a><br><br>Grazie!",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ehilà,<br><br>volevo solamente farti sapere che %s ha condiviso »%s« con te.<br><a href=\"%s\">Guarda!</a><br><br>Saluti!",
 "prev" => "precedente",
 "next" => "successivo",
 "Updating ownCloud to version %s, this may take a while." => "Aggiornamento di ownCloud alla versione %s in corso, ciò potrebbe richiedere del tempo."

core/l10n/ja_JP.php

@@ -90,7 +90,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "リクエストに失敗しました！<br>あなたのメール／ユーザ名が正しいことを確認しましたか？",
 "You will receive a link to reset your password via Email." => "メールでパスワードをリセットするリンクが届きます。",
 "Username" => "ユーザー名",
-"Your files seems to be encrypted. If you didn't have enabled the recovery key there will be no way to get your data back once the password was resetted. If you are not sure what to do, please contact your administrator first before continue. Do you really want to continue?" => "ファイルが暗号化されているようです。復旧キーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "ファイルが暗号化されています。復旧キーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかよくわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？",
 "Yes, I really want to reset my password now" => "はい、今すぐパスワードをリセットします。",
 "Request reset" => "リセットを要求します。",
 "Your password was reset" => "あなたのパスワードはリセットされました。",

core/l10n/nl.php

@@ -1,20 +1,20 @@
 <?php $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s deelde »%s« met u",
+"%s shared »%s« with you" => "%s deelde »%s« met jou",
 "Category type not provided." => "Categorie type niet opgegeven.",
-"No category to add?" => "Geen categorie toevoegen?",
+"No category to add?" => "Geen categorie om toe te voegen?",
 "This category already exists: %s" => "Deze categorie bestaat al: %s",
 "Object type not provided." => "Object type niet opgegeven.",
 "%s ID not provided." => "%s ID niet opgegeven.",
 "Error adding %s to favorites." => "Toevoegen van %s aan favorieten is mislukt.",
 "No categories selected for deletion." => "Geen categorie geselecteerd voor verwijdering.",
 "Error removing %s from favorites." => "Verwijderen %s van favorieten is mislukt.",
-"Sunday" => "Zondag",
-"Monday" => "Maandag",
-"Tuesday" => "Dinsdag",
-"Wednesday" => "Woensdag",
-"Thursday" => "Donderdag",
-"Friday" => "Vrijdag",
-"Saturday" => "Zaterdag",
+"Sunday" => "zondag",
+"Monday" => "maandag",
+"Tuesday" => "dinsdag",
+"Wednesday" => "woensdag",
+"Thursday" => "donderdag",
+"Friday" => "vrijdag",
+"Saturday" => "zaterdag",
 "January" => "januari",
 "February" => "februari",
 "March" => "maart",
@@ -60,13 +60,13 @@
 "Shared with you by {owner}" => "Gedeeld met u door {owner}",
 "Share with" => "Deel met",
 "Share with link" => "Deel met link",
-"Password protect" => "Wachtwoord beveiliging",
+"Password protect" => "Wachtwoord beveiligd",
 "Password" => "Wachtwoord",
 "Email link to person" => "E-mail link naar persoon",
 "Send" => "Versturen",
 "Set expiration date" => "Stel vervaldatum in",
 "Expiration date" => "Vervaldatum",
-"Share via email:" => "Deel via email:",
+"Share via email:" => "Deel via e-mail:",
 "No people found" => "Geen mensen gevonden",
 "Resharing is not allowed" => "Verder delen is niet toegestaan",
 "Shared in {item} with {user}" => "Gedeeld in {item} met {user}",
@@ -83,18 +83,19 @@
 "Sending ..." => "Versturen ...",
 "Email sent" => "E-mail verzonden",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
-"The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud.",
-"ownCloud password reset" => "ownCloud wachtwoord herstellen",
+"The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. Je wordt teruggeleid naar je eigen ownCloud.",
+"ownCloud password reset" => "ownCloud-wachtwoord herstellen",
 "Use the following link to reset your password: {link}" => "Gebruik de volgende link om je wachtwoord te resetten: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "De link voor het resetten van uw wachtwoord is verzonden naar uw e-mailadres.<br>Als u dat bericht niet snel ontvangen hebt, controleer dan uw spambakje.<br>Als het daar ook niet is, vraag dan uw beheerder om te helpen.",
-"Request failed!<br>Did you make sure your email/username was right?" => "Aanvraag mislukt!<br>Weet u zeker dat uw gebruikersnaam en/of wachtwoord goed waren?",
-"You will receive a link to reset your password via Email." => "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "De link voor het resetten van je wachtwoord is verzonden naar je e-mailadres.<br>Als je dat bericht niet snel ontvangen hebt, controleer dan uw spambakje.<br>Als het daar ook niet is, vraag dan je beheerder om te helpen.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Aanvraag mislukt!<br>Weet je zeker dat je gebruikersnaam en/of wachtwoord goed waren?",
+"You will receive a link to reset your password via Email." => "Je ontvangt een link om je wachtwoord opnieuw in te stellen via e-mail.",
 "Username" => "Gebruikersnaam",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Je bestanden zijn versleuteld. Als je geen recoverykey hebt ingeschakeld is er geen manier om je data terug te krijgen indien je je wachtwoord reset!\nAls je niet weet wat te doen, neem dan alsjeblieft contact op met je administrator eer je doorgaat.\nWil je echt doorgaan?",
 "Yes, I really want to reset my password now" => "Ja, ik wil mijn wachtwoord nu echt resetten",
 "Request reset" => "Resetaanvraag",
 "Your password was reset" => "Je wachtwoord is gewijzigd",
 "To login page" => "Naar de login-pagina",
-"New password" => "Nieuw",
+"New password" => "Nieuw wachtwoord",
 "Reset password" => "Reset wachtwoord",
 "Personal" => "Persoonlijk",
 "Users" => "Gebruikers",
@@ -103,17 +104,17 @@
 "Help" => "Help",
 "Access forbidden" => "Toegang verboden",
 "Cloud not found" => "Cloud niet gevonden",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo daar,\n\n%s deelde %s met u.\nBekijk: %s\n\nVeel plezier!",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo daar,\n\n%s deelde %s met jou.\nBekijk: %s\n\nVeel plezier!",
 "web services under your control" => "Webdiensten in eigen beheer",
 "Edit categories" => "Wijzig categorieën",
 "Add" => "Toevoegen",
 "Security Warning" => "Beveiligingswaarschuwing",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Uw PHP versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Werk uw PHP installatie bij om ownCloud veilig te kunnen gebruiken.",
-"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Er kon geen willekeurig nummer worden gegenereerd. Zet de PHP OpenSSL extentie aan.",
-"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Zonder random nummer generator is het mogelijk voor een aanvaller om de reset tokens van wachtwoorden te voorspellen. Dit kan leiden tot het inbreken op uw account.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess bestand niet werkt.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Informatie over het configureren van uw server is hier te vinden <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentatie</a>.",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Je PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Werk je PHP-installatie bij om ownCloud veilig te kunnen gebruiken.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Er kon geen willekeurig nummer worden gegenereerd. Zet de PHP OpenSSL-extentie aan.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Zonder random nummer generator is het mogelijk voor een aanvaller om de resettokens van wachtwoorden te voorspellen. Dit kan leiden tot het inbreken op uw account.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Je gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet werkt.",
+"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Informatie over het configureren van uw server is <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">hier</a> te vinden.",
 "Create an <strong>admin account</strong>" => "Maak een <strong>beheerdersaccount</strong> aan",
 "Advanced" => "Geavanceerd",
 "Data folder" => "Gegevensmap",
@@ -123,19 +124,19 @@
 "Database password" => "Wachtwoord database",
 "Database name" => "Naam database",
 "Database tablespace" => "Database tablespace",
-"Database host" => "Database server",
+"Database host" => "Databaseserver",
 "Finish setup" => "Installatie afronden",
 "%s is available. Get more information on how to update." => "%s is beschikbaar. Verkrijg meer informatie over het bijwerken.",
 "Log out" => "Afmelden",
 "Automatic logon rejected!" => "Automatische aanmelding geweigerd!",
-"If you did not change your password recently, your account may be compromised!" => "Als u uw wachtwoord niet onlangs heeft aangepast, kan uw account overgenomen zijn!",
-"Please change your password to secure your account again." => "Wijzig uw wachtwoord zodat uw account weer beveiligd is.",
-"Lost your password?" => "Uw wachtwoord vergeten?",
+"If you did not change your password recently, your account may be compromised!" => "Als je je wachtwoord niet onlangs heeft aangepast, kan je account overgenomen zijn!",
+"Please change your password to secure your account again." => "Wijzig je wachtwoord zodat je account weer beveiligd is.",
+"Lost your password?" => "Wachtwoord vergeten?",
 "remember" => "onthoud gegevens",
 "Log in" => "Meld je aan",
 "Alternative Logins" => "Alternatieve inlogs",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo daar,<br><br> %s deelde »%s« met u.<br><a href=\"%s\">Bekijk!</a><br><br>Veel plezier!",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo daar,<br><br> %s deelde »%s« met jou.<br><a href=\"%s\">Bekijk!</a><br><br>Veel plezier!",
 "prev" => "vorige",
 "next" => "volgende",
-"Updating ownCloud to version %s, this may take a while." => "Updaten ownCloud naar versie %s, dit kan even duren."
+"Updating ownCloud to version %s, this may take a while." => "Updaten ownCloud naar versie %s, dit kan even duren..."
 );

core/l10n/pt_BR.php

@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s compartilhou »%s« com você",
 "Category type not provided." => "Tipo de categoria não fornecido.",
 "No category to add?" => "Nenhuma categoria a adicionar?",
 "This category already exists: %s" => "Esta categoria já existe: %s",
@@ -89,6 +90,8 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "O pedido falhou! <br>Certifique-se que seu e-mail/username estavam corretos?",
 "You will receive a link to reset your password via Email." => "Você receberá um link para redefinir sua senha por e-mail.",
 "Username" => "Nome de usuário",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Seus arquivos estão encriptados. Se você não habilitou a chave de recuperação, não haverá maneira de recuperar seus dados após criar uma nova senha. Se você não tem certeza do que fazer,  por favor entre em contato com o administrador antes de continuar. Tem certeza que realmente quer continuar?",
+"Yes, I really want to reset my password now" => "Sim, realmente quero criar uma nova senha.",
 "Request reset" => "Pedir redefinição",
 "Your password was reset" => "Sua senha foi redefinida",
 "To login page" => "Para a página de login",
@@ -101,6 +104,7 @@
 "Help" => "Ajuda",
 "Access forbidden" => "Acesso proibido",
 "Cloud not found" => "Cloud não encontrado",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Olá,\n\napenas para você saber que %s compartilhou %s com você.\nVeja: %s\n\nAbraços!",
 "web services under your control" => "serviços web sob seu controle",
 "Edit categories" => "Editar categorias",
 "Add" => "Adicionar",
@@ -131,6 +135,7 @@
 "remember" => "lembrar",
 "Log in" => "Fazer login",
 "Alternative Logins" => "Logins alternativos",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Olá,<br><br>apenas para você saber que %s compartilhou %s com você.<br><a href=\"%s\">Veja: </a><br><br>Abraços!",
 "prev" => "anterior",
 "next" => "próximo",
 "Updating ownCloud to version %s, this may take a while." => "Atualizando ownCloud para a versão %s, isto pode levar algum tempo."

core/l10n/ro.php

@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Category type not provided." => "Tipul de categorie nu este prevazut",
+"%s shared »%s« with you" => "%s Partajat »%s« cu tine de",
+"Category type not provided." => "Tipul de categorie nu a fost specificat.",
 "No category to add?" => "Nici o categorie de adăugat?",
 "This category already exists: %s" => "Această categorie deja există: %s",
 "Object type not provided." => "Tipul obiectului nu este prevazut",
@@ -42,6 +43,7 @@
 "years ago" => "ani în urmă",
 "Choose" => "Alege",
 "Cancel" => "Anulare",
+"Error loading file picker template" => "Eroare la încărcarea șablonului selectorului de fișiere",
 "Yes" => "Da",
 "No" => "Nu",
 "Ok" => "Ok",
@@ -88,6 +90,8 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Cerere esuata!<br>Esti sigur ca email-ul/numele de utilizator sunt corecte?",
 "You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email",
 "Username" => "Nume utilizator",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Fișierele tale sunt criptate. Dacă nu ai activat o cheie de recuperare, nu va mai exista nici o metodă prin care să îți recuperezi datele după resetarea parole. Dacă nu ești sigur în privința la ce ai de făcut, contactează un administrator înainte să continuii. Chiar vrei să continui?",
+"Yes, I really want to reset my password now" => "Da, eu chiar doresc să îmi resetez parola acum",
 "Request reset" => "Cerere trimisă",
 "Your password was reset" => "Parola a fost resetată",
 "To login page" => "Spre pagina de autentificare",
@@ -100,6 +104,7 @@
 "Help" => "Ajutor",
 "Access forbidden" => "Acces interzis",
 "Cloud not found" => "Nu s-a găsit",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Salutare,\n\nVă aduc la cunoștință că %s a partajat %s cu tine.\nAccesează la: %s\n\nNumai bine!",
 "web services under your control" => "servicii web controlate de tine",
 "Edit categories" => "Editează categorii",
 "Add" => "Adaugă",
@@ -121,6 +126,7 @@
 "Database tablespace" => "Tabela de spațiu a bazei de date",
 "Database host" => "Bază date",
 "Finish setup" => "Finalizează instalarea",
+"%s is available. Get more information on how to update." => "%s este disponibil. Vezi mai multe informații despre procesul de actualizare.",
 "Log out" => "Ieșire",
 "Automatic logon rejected!" => "Logare automata respinsa",
 "If you did not change your password recently, your account may be compromised!" => "Daca nu schimbi parola cand de curand , contul tau poate fi conpromis",
@@ -129,6 +135,7 @@
 "remember" => "amintește",
 "Log in" => "Autentificare",
 "Alternative Logins" => "Conectări alternative",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Salutare, <br><br>Vă aduc la cunoștință că %s a partajat %s cu tine.<br><a href=\"%s\">Accesează-l!</a><br><br>Numai bine!",
 "prev" => "precedentul",
 "next" => "următorul",
 "Updating ownCloud to version %s, this may take a while." => "Actualizăm ownCloud la versiunea %s, aceasta poate dura câteva momente."

core/l10n/ru.php

@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s поделился »%s« с вами",
 "Category type not provided." => "Тип категории не предоставлен",
 "No category to add?" => "Нет категорий для добавления?",
 "This category already exists: %s" => "Эта категория уже существует: %s",
@@ -89,6 +90,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Что-то не так. Вы уверены что Email / Имя пользователя указаны верно?",
 "You will receive a link to reset your password via Email." => "На ваш адрес Email выслана ссылка для сброса пароля.",
 "Username" => "Имя пользователя",
+"Yes, I really want to reset my password now" => "Да, я действительно хочу сбросить свой пароль",
 "Request reset" => "Запросить сброс",
 "Your password was reset" => "Ваш пароль был сброшен",
 "To login page" => "На страницу авторизации",
@@ -101,6 +103,7 @@
 "Help" => "Помощь",
 "Access forbidden" => "Доступ запрещён",
 "Cloud not found" => "Облако не найдено",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Приветствую,⏎\n⏎\nпросто даю знать, что %s поделился %s с вами.⏎\nПосмотреть: %s⏎\n⏎\nУдачи!",
 "web services under your control" => "веб-сервисы под вашим управлением",
 "Edit categories" => "Редактировать категрии",
 "Add" => "Добавить",
@@ -131,6 +134,7 @@
 "remember" => "запомнить",
 "Log in" => "Войти",
 "Alternative Logins" => "Альтернативные имена пользователя",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Приветствую,<br><br>просто даю знать, что %s поделился »%s« с вами.<br><a href=\"%s\">Посмотреть!</a><br><br>Удачи!",
 "prev" => "пред",
 "next" => "след",
 "Updating ownCloud to version %s, this may take a while." => "Производится обновление ownCloud до версии %s. Это может занять некоторое время."

core/l10n/sk_SK.php

@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s s Vami zdieľa »%s«",
 "Category type not provided." => "Neposkytnutý typ kategórie.",
 "No category to add?" => "Žiadna kategória pre pridanie?",
 "This category already exists: %s" => "Kategória: %s už existuje.",
@@ -42,6 +43,7 @@
 "years ago" => "pred rokmi",
 "Choose" => "Výber",
 "Cancel" => "Zrušiť",
+"Error loading file picker template" => "Chyba pri načítaní šablóny výberu súborov",
 "Yes" => "Áno",
 "No" => "Nie",
 "Ok" => "Ok",
@@ -88,6 +90,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Požiadavka zlyhala.<br>Uistili ste sa, že Vaše používateľské meno a email sú správne?",
 "You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržíte e-mailom.",
 "Username" => "Meno používateľa",
+"Yes, I really want to reset my password now" => "Áno, želám si teraz obnoviť svoje heslo",
 "Request reset" => "Požiadať o obnovenie",
 "Your password was reset" => "Vaše heslo bolo obnovené",
 "To login page" => "Na prihlasovaciu stránku",
@@ -100,6 +103,7 @@
 "Help" => "Pomoc",
 "Access forbidden" => "Prístup odmietnutý",
 "Cloud not found" => "Nenájdené",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ahoj,\n\nChcem Vám oznámiť, že %s s Vami zdieľa %s.\nPozrieť si to môžete tu: %s\n\nVďaka",
 "web services under your control" => "webové služby pod Vašou kontrolou",
 "Edit categories" => "Upraviť kategórie",
 "Add" => "Pridať",
@@ -130,6 +134,7 @@
 "remember" => "zapamätať",
 "Log in" => "Prihlásiť sa",
 "Alternative Logins" => "Alternatívne prihlasovanie",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ahoj,<br><br>chcem Vám oznámiť, že %s s Vami zdieľa %s.\nPozrieť si to môžete tu: <br><a href=\"%s\">zde</a>.<br><br>Vďaka",
 "prev" => "späť",
 "next" => "ďalej",
 "Updating ownCloud to version %s, this may take a while." => "Aktualizujem ownCloud na verziu %s, môže to chvíľu trvať."

core/l10n/sl.php

@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"%s shared »%s« with you" => "%s je delil »%s« z vami",
 "Category type not provided." => "Vrsta kategorije ni podana.",
 "No category to add?" => "Ali ni kategorije za dodajanje?",
 "This category already exists: %s" => "Kategorija že obstaja: %s",
@@ -42,6 +43,7 @@
 "years ago" => "let nazaj",
 "Choose" => "Izbor",
 "Cancel" => "Prekliči",
+"Error loading file picker template" => "Napaka pri nalaganju predloge za izbor dokumenta",
 "Yes" => "Da",
 "No" => "Ne",
 "Ok" => "V redu",
@@ -88,6 +90,8 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Zahteva je spodletela!<br>Ali sta elektronski naslov oziroma uporabniško ime navedena pravilno?",
 "You will receive a link to reset your password via Email." => "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.",
 "Username" => "Uporabniško ime",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Datoteke so šifrirane. Če niste omogočili ključa za obnovitev, žal podatkov ne bo mogoče pridobiti nazaj, ko boste geslo enkrat spremenili. Če niste prepričani, kaj storiti, se obrnite na skrbnika storitve. Ste prepričani, da želite nadaljevati?",
+"Yes, I really want to reset my password now" => "Da, potrjujem ponastavitev gesla",
 "Request reset" => "Zahtevaj ponovno nastavitev",
 "Your password was reset" => "Geslo je ponovno nastavljeno",
 "To login page" => "Na prijavno stran",
@@ -100,6 +104,7 @@
 "Help" => "Pomoč",
 "Access forbidden" => "Dostop je prepovedan",
 "Cloud not found" => "Oblaka ni mogoče najti",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Pozdravljen/a,⏎\n⏎\nsporočam, da je %s delil %s s teboj.⏎\nPoglej na: %s⏎\n⏎\nLep pozdrav!",
 "web services under your control" => "spletne storitve pod vašim nadzorom",
 "Edit categories" => "Uredi kategorije",
 "Add" => "Dodaj",
@@ -130,6 +135,7 @@
 "remember" => "zapomni si",
 "Log in" => "Prijava",
 "Alternative Logins" => "Druge prijavne možnosti",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Pozdravljen/a,<br><br>sporočam, da je %s delil »%s« s teboj.<br><a href=\"%s\">Poglej vsebine!</a><br><br>Lep pozdrav!",
 "prev" => "nazaj",
 "next" => "naprej",
 "Updating ownCloud to version %s, this may take a while." => "Posodabljanje sistema ownCloud na različico %s je lahko dolgotrajno."

core/l10n/sv.php

@@ -90,7 +90,6 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Begäran misslyckades!<br>Är du helt säker på att din e-postadress/användarnamn är korrekt?",
 "You will receive a link to reset your password via Email." => "Du får en länk att återställa ditt lösenord via e-post.",
 "Username" => "Användarnamn",
-"Your files seems to be encrypted. If you didn't have enabled the recovery key there will be no way to get your data back once the password was resetted. If you are not sure what to do, please contact your administrator first before continue. Do you really want to continue?" => "Dina filer ser ut att vara krypterade. Om du inte har aktiverat återställningsnyckeln så finns finns det inget sätt att få tillbaka dina filer när du väl har återställt lösenordet. Om du inte är säker på vad du ska göra, vänligen kontakta din administratör innan du fortsätter. Vill du verkligen fortsätta?",
 "Yes, I really want to reset my password now" => "Ja, jag vill verkligen återställa mitt lösenord nu",
 "Request reset" => "Begär återställning",
 "Your password was reset" => "Ditt lösenord har återställts",

core/l10n/zh_TW.php

@@ -89,6 +89,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "請求失敗！<br>您確定填入的電子郵件地址或是帳號名稱是正確的嗎？",
 "You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到你的電子郵件信箱。",
 "Username" => "使用者名稱",
+"Yes, I really want to reset my password now" => "對，我現在想要重設我的密碼。",
 "Request reset" => "請求重設",
 "Your password was reset" => "您的密碼已重設",
 "To login page" => "至登入頁面",

index.php

@@ -32,6 +32,6 @@ try {
 } catch (Exception $ex) {
 	//show the user a detailed error page
 	OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
-	\OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL);
+	\OCP\Util::writeLog('index', $ex->getMessage(), \OCP\Util::FATAL);
 	OC_Template::printExceptionErrorPage($ex);
-}
+}

l10n/af_ZA/core.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-18 02:04+0200\n"
-"PO-Revision-Date: 2013-06-17 00:13+0000\n"
+"POT-Creation-Date: 2013-06-27 02:04+0200\n"
+"PO-Revision-Date: 2013-06-27 00:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr ""
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr ""
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr ""
 
-#: js/js.js:286
+#: js/js.js:289
 msgid "Settings"
 msgstr "Instellings"
 
-#: js/js.js:718
+#: js/js.js:721
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:722
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:723
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:724
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:725
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:726
 msgid "today"
 msgstr ""
 
-#: js/js.js:724
+#: js/js.js:727
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:725
+#: js/js.js:728
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:729
 msgid "last month"
 msgstr ""
 
-#: js/js.js:727
+#: js/js.js:730
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:731
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:732
 msgid "last year"
 msgstr ""
 
-#: js/js.js:730
+#: js/js.js:733
 msgid "years ago"
 msgstr ""
 
@@ -373,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -403,17 +403,17 @@ msgstr "Gebruikersnaam"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Herstel-versoek"
 

l10n/af_ZA/files_encryption.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-06-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -60,6 +60,16 @@ msgid ""
 "regain access to your files"
 msgstr ""
 
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
@@ -84,11 +94,11 @@ msgstr ""
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +110,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53

l10n/af_ZA/files_sharing.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:47+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-06-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"

l10n/af_ZA/lib.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-18 02:05+0200\n"
-"PO-Revision-Date: 2013-06-17 00:14+0000\n"
+"POT-Creation-Date: 2013-06-27 02:04+0200\n"
+"PO-Revision-Date: 2013-06-27 00:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"

l10n/af_ZA/settings.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-11 01:57+0200\n"
-"PO-Revision-Date: 2013-06-10 23:57+0000\n"
+"POT-Creation-Date: 2013-06-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr ""
 
@@ -324,11 +324,11 @@ msgstr ""
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:114
+#: templates/admin.php:237 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -338,27 +338,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr ""
 
@@ -386,76 +386,76 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:8
+#: templates/personal.php:9
+msgid "Get the apps to sync your files"
+msgstr ""
+
+#: templates/personal.php:20
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:28
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:15
-msgid "Get the apps to sync your files"
-msgstr ""
-
-#: templates/personal.php:26
-msgid "Show First Run Wizard again"
-msgstr ""
-
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Wagwoord"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nuwe wagwoord"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:85
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +485,10 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "Gebruikersnaam"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""

l10n/af_ZA/user_ldap.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-06-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"

l10n/ar/core.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-18 02:04+0200\n"
-"PO-Revision-Date: 2013-06-17 23:25+0000\n"
+"POT-Creation-Date: 2013-06-28 01:58+0200\n"
+"PO-Revision-Date: 2013-06-27 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr "لم يتم اختيار فئة للحذف"
 msgid "Error removing %s from favorites."
 msgstr "خطأ في حذف %s من المفضلة"
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "الاحد"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "الأثنين"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "الثلاثاء"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "الاربعاء"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "الخميس"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "الجمعه"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "السبت"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "كانون الثاني"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "شباط"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "آذار"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "نيسان"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "أيار"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "حزيران"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "تموز"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "آب"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "أيلول"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "تشرين الاول"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "تشرين الثاني"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "كانون الاول"
 
-#: js/js.js:286
+#: js/js.js:289
 msgid "Settings"
 msgstr "إعدادات"
 
-#: js/js.js:718
+#: js/js.js:721
 msgid "seconds ago"
 msgstr "منذ ثواني"
 
-#: js/js.js:719
+#: js/js.js:722
 msgid "1 minute ago"
 msgstr "منذ دقيقة"
 
-#: js/js.js:720
+#: js/js.js:723
 msgid "{minutes} minutes ago"
 msgstr "{minutes} منذ دقائق"
 
-#: js/js.js:721
+#: js/js.js:724
 msgid "1 hour ago"
 msgstr "قبل ساعة مضت"
 
-#: js/js.js:722
+#: js/js.js:725
 msgid "{hours} hours ago"
 msgstr "{hours} ساعة مضت"
 
-#: js/js.js:723
+#: js/js.js:726
 msgid "today"
 msgstr "اليوم"
 
-#: js/js.js:724
+#: js/js.js:727
 msgid "yesterday"
 msgstr "يوم أمس"
 
-#: js/js.js:725
+#: js/js.js:728
 msgid "{days} days ago"
 msgstr "{days} يوم سابق"
 
-#: js/js.js:726
+#: js/js.js:729
 msgid "last month"
 msgstr "الشهر الماضي"
 
-#: js/js.js:727
+#: js/js.js:730
 msgid "{months} months ago"
 msgstr "{months} شهر مضت"
 
-#: js/js.js:728
+#: js/js.js:731
 msgid "months ago"
 msgstr "شهر مضى"
 
-#: js/js.js:729
+#: js/js.js:732
 msgid "last year"
 msgstr "السنةالماضية"
 
-#: js/js.js:730
+#: js/js.js:733
 msgid "years ago"
 msgstr "سنة مضت"
 
@@ -373,7 +373,7 @@ msgstr "حصل خطأ في عملية التحديث, يرجى ارسال تقر
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud"
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "إعادة تعيين كلمة سر ownCloud"
 
@@ -403,17 +403,17 @@ msgstr "إسم المستخدم"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "طلب تعديل"
 

l10n/ar/files.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-18 02:04+0200\n"
-"PO-Revision-Date: 2013-06-17 23:25+0000\n"
+"POT-Creation-Date: 2013-06-28 01:58+0200\n"
+"PO-Revision-Date: 2013-06-27 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -183,35 +183,35 @@ msgstr "عنوان ال URL  لا يجوز أن يكون فارغا."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "إسم مجلد غير صحيح. استخدام مصطلح \"Shared\" محجوز للنظام"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "خطأ"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "اسم"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "حجم"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "معدل"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "مجلد عدد 1"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} مجلدات"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "ملف واحد"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} ملفات"
 

l10n/ar/files_encryption.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-06-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -60,6 +60,16 @@ msgid ""
 "regain access to your files"
 msgstr ""
 
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "جاري الحفظ..."
@@ -84,11 +94,11 @@ msgstr "التشفير"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +110,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53

l10n/ar/files_external.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-18 02:04+0200\n"
-"PO-Revision-Date: 2013-06-17 23:25+0000\n"
+"POT-Creation-Date: 2013-06-28 01:58+0200\n"
+"PO-Revision-Date: 2013-06-27 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"

l10n/ar/files_sharing.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-18 02:04+0200\n"
-"PO-Revision-Date: 2013-06-17 23:25+0000\n"
+"POT-Creation-Date: 2013-06-28 01:58+0200\n"
+"PO-Revision-Date: 2013-06-27 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"

l10n/ar/files_trashbin.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-18 02:04+0200\n"
-"PO-Revision-Date: 2013-06-17 23:25+0000\n"
+"POT-Creation-Date: 2013-06-28 01:58+0200\n"
+"PO-Revision-Date: 2013-06-27 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"

l10n/ar/lib.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-18 02:05+0200\n"
-"PO-Revision-Date: 2013-06-17 23:25+0000\n"
+"POT-Creation-Date: 2013-06-28 01:58+0200\n"
+"PO-Revision-Date: 2013-06-27 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"

l10n/ar/settings.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-18 02:05+0200\n"
-"PO-Revision-Date: 2013-06-17 23:25+0000\n"
+"POT-Creation-Date: 2013-06-28 01:58+0200\n"
+"PO-Revision-Date: 2013-06-27 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -455,7 +455,7 @@ msgstr "WebDAV"
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "إستخدم هذا العنوان للإتصال بـ ownCloud في مدير الملفات"
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "اسم الدخول"
 
@@ -485,6 +485,10 @@ msgstr "غير محدود"
 msgid "Other"
 msgstr "شيء آخر"
 
+#: templates/users.php:84
+msgid "Username"
+msgstr "إسم المستخدم"
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr "وحدة التخزين"

l10n/ar/user_ldap.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-18 02:04+0200\n"
-"PO-Revision-Date: 2013-06-17 23:26+0000\n"
+"POT-Creation-Date: 2013-06-28 01:58+0200\n"
+"PO-Revision-Date: 2013-06-27 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"

l10n/be/core.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-15 01:59+0200\n"
-"PO-Revision-Date: 2013-06-14 23:59+0000\n"
+"POT-Creation-Date: 2013-06-20 02:37+0200\n"
+"PO-Revision-Date: 2013-06-20 00:37+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -373,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -403,17 +403,17 @@ msgstr ""
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr ""
 

l10n/be/files_encryption.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-06-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -60,6 +60,16 @@ msgid ""
 "regain access to your files"
 msgstr ""
 
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
@@ -84,11 +94,11 @@ msgstr ""
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +110,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53

l10n/be/settings.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-11 01:57+0200\n"
-"PO-Revision-Date: 2013-06-10 23:57+0000\n"
+"POT-Creation-Date: 2013-06-20 02:37+0200\n"
+"PO-Revision-Date: 2013-06-20 00:37+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr ""
 
@@ -324,11 +324,11 @@ msgstr ""
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:114
+#: templates/admin.php:237 templates/personal.php:119
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -338,27 +338,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr ""
 
@@ -386,76 +386,76 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:8
+#: templates/personal.php:9
+msgid "Get the apps to sync your files"
+msgstr ""
+
+#: templates/personal.php:20
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:28
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:15
-msgid "Get the apps to sync your files"
-msgstr ""
-
-#: templates/personal.php:26
-msgid "Show First Run Wizard again"
-msgstr ""
-
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:86
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:85
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:84
+#: templates/users.php:21
 msgid "Login Name"
 msgstr ""
 
@@ -485,6 +485,10 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
+#: templates/users.php:84
+msgid "Username"
+msgstr ""
+
 #: templates/users.php:91
 msgid "Storage"
 msgstr ""

l10n/bg_BG/core.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-18 02:04+0200\n"
-"PO-Revision-Date: 2013-06-17 23:24+0000\n"
+"POT-Creation-Date: 2013-06-28 01:58+0200\n"
+"PO-Revision-Date: 2013-06-27 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -61,135 +61,135 @@ msgstr "Няма избрани категории за изтриване"
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:32
 msgid "Sunday"
 msgstr "Неделя"
 
-#: js/config.php:35
+#: js/config.php:33
 msgid "Monday"
 msgstr "Понеделник"
 
-#: js/config.php:36
+#: js/config.php:34
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: js/config.php:37
+#: js/config.php:35
 msgid "Wednesday"
 msgstr "Сряда"
 
-#: js/config.php:38
+#: js/config.php:36
 msgid "Thursday"
 msgstr "Четвъртък"
 
-#: js/config.php:39
+#: js/config.php:37
 msgid "Friday"
 msgstr "Петък"
 
-#: js/config.php:40
+#: js/config.php:38
 msgid "Saturday"
 msgstr "Събота"
 
-#: js/config.php:45
+#: js/config.php:43
 msgid "January"
 msgstr "Януари"
 
-#: js/config.php:46
+#: js/config.php:44
 msgid "February"
 msgstr "Февруари"
 
-#: js/config.php:47
+#: js/config.php:45
 msgid "March"
 msgstr "Март"
 
-#: js/config.php:48
+#: js/config.php:46
 msgid "April"
 msgstr "Април"
 
-#: js/config.php:49
+#: js/config.php:47
 msgid "May"
 msgstr "Май"
 
-#: js/config.php:50
+#: js/config.php:48
 msgid "June"
 msgstr "Юни"
 
-#: js/config.php:51
+#: js/config.php:49
 msgid "July"
 msgstr "Юли"
 
-#: js/config.php:52
+#: js/config.php:50
 msgid "August"
 msgstr "Август"
 
-#: js/config.php:53
+#: js/config.php:51
 msgid "September"
 msgstr "Септември"
 
-#: js/config.php:54
+#: js/config.php:52
 msgid "October"
 msgstr "Октомври"
 
-#: js/config.php:55
+#: js/config.php:53
 msgid "November"
 msgstr "Ноември"
 
-#: js/config.php:56
+#: js/config.php:54
 msgid "December"
 msgstr "Декември"
 
-#: js/js.js:286
+#: js/js.js:289
 msgid "Settings"
 msgstr "Настройки"
 
-#: js/js.js:718
+#: js/js.js:721
 msgid "seconds ago"
 msgstr "преди секунди"
 
-#: js/js.js:719
+#: js/js.js:722
 msgid "1 minute ago"
 msgstr "преди 1 минута"
 
-#: js/js.js:720
+#: js/js.js:723
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:724
 msgid "1 hour ago"
 msgstr "преди 1 час"
 
-#: js/js.js:722
+#: js/js.js:725
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:726
 msgid "today"
 msgstr "днес"
 
-#: js/js.js:724
+#: js/js.js:727
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:725
+#: js/js.js:728
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:726
+#: js/js.js:729
 msgid "last month"
 msgstr "последният месец"
 
-#: js/js.js:727
+#: js/js.js:730
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:728
+#: js/js.js:731
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:729
+#: js/js.js:732
 msgid "last year"
 msgstr "последната година"
 
-#: js/js.js:730
+#: js/js.js:733
 msgid "years ago"
 msgstr "последните години"
 
@@ -373,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:58
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -403,17 +403,17 @@ msgstr "Потребител"
 
 #: lostpassword/templates/lostpassword.php:22
 msgid ""
-"Your files seems to be encrypted. If you didn't have enabled the recovery "
-"key there will be no way to get your data back once the password was "
-"resetted. If you are not sure what to do, please contact your administrator "
-"first before continue. Do you really want to continue?"
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
 msgstr ""
 
 #: lostpassword/templates/lostpassword.php:24
 msgid "Yes, I really want to reset my password now"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Нулиране на заявка"
 

l10n/bg_BG/files.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-18 02:04+0200\n"
-"PO-Revision-Date: 2013-06-17 23:25+0000\n"
+"POT-Creation-Date: 2013-06-28 01:58+0200\n"
+"PO-Revision-Date: 2013-06-27 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -183,35 +183,35 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Грешка"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Променено"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} папки"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} файла"
 

l10n/bg_BG/files_encryption.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-14 02:46+0200\n"
-"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"POT-Creation-Date: 2013-06-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -60,6 +60,16 @@ msgid ""
 "regain access to your files"
 msgstr ""
 
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Записване..."
@@ -84,11 +94,11 @@ msgstr "Криптиране"
 
 #: templates/settings-admin.php:10
 msgid ""
-"Enable encryption passwords recovery key (allow sharing to recovery key):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
 #: templates/settings-admin.php:14
-msgid "Recovery account password"
+msgid "Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:54
@@ -100,15 +110,15 @@ msgid "Disabled"
 msgstr ""
 
 #: templates/settings-admin.php:34
-msgid "Change encryption passwords recovery key:"
+msgid "Change recovery key password:"
 msgstr ""
 
 #: templates/settings-admin.php:41
-msgid "Old Recovery account password"
+msgid "Old Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:48
-msgid "New Recovery account password"
+msgid "New Recovery key password"
 msgstr ""
 
 #: templates/settings-admin.php:53

l10n/bg_BG/files_external.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-18 02:04+0200\n"
-"PO-Revision-Date: 2013-06-17 23:25+0000\n"
+"POT-Creation-Date: 2013-06-28 01:58+0200\n"
+"PO-Revision-Date: 2013-06-27 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"