Merge branch 'master' into oc_preview

1050 files changed, 20121 insertions, 11404 deletions

diff --git a/.gitignore b/.gitignore
index fe89c74ab38..68977ad0775 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@ config/mount.php
 apps/inc.php
 
 # ignore all apps except core ones
-apps/*
+apps*
 !apps/files
 !apps/files_encryption
 !apps/files_external
@@ -76,4 +76,4 @@ nbproject
 data-autotest
 /tests/coverage*
 /tests/autoconfig*
-/tests/autotest*
\ No newline at end of file
+/tests/autotest*
diff --git a/3rdparty b/3rdparty
-Subproject d59b017922d9ac3bf985dee0eb721ec1a901ac7
+Subproject 3ef9f738a9107879dddc7d97842cf4d2198fae4
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fd87513ec2a..a79fcc08d60 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,11 +1,15 @@
 ## Submitting issues
 
-If you have questions about how to use ownCloud, please direct these to the [mailing list][mailinglist] or our [forum][forum]. We are also available on [IRC][irc].
+If you have questions about how to install or use ownCloud, please direct these to the [mailing list][mailinglist] or our [forum][forum]. We are also available on [IRC][irc].
+
+### TL;DR
+
+ * The [issue template can be found here][template] but be aware of the different repositories! See list below.
 
 ### Guidelines
-* Please search the existing issues first, it's likely that your issue was already reported.
-* [Report the issue](https://github.com/owncloud/core/issues/new) using our [template][template], it includes all the informations we need to track down the issue.
-* This repository is *only* for issues within the ownCloud core code. Issues in other compontents should be reported in their own repositores: 
+* Please search the existing issues first, it's likely that your issue was already reported or even fixed.
+* This repository is *only* for issues within the ownCloud core code. This also includes the apps: files, encryption, external storage, sharing, deleted files, versions, LDAP, and WebDAV Auth
+* The issues in other components should be reported in their respective repositories: 
   - [Android client](https://github.com/owncloud/android/issues)
   - [iOS client](https://github.com/owncloud/ios-issues/issues)
   - [Desktop client](https://github.com/owncloud/mirall/issues)
@@ -14,12 +18,12 @@ If you have questions about how to use ownCloud, please direct these to the [mai
       - [Calendar](https://github.com/owncloud/calendar/issues)
       - [Contacts](https://github.com/owncloud/contacts/issues)
       - [Mail](https://github.com/owncloud/mail/issues)
+      - [Media/Music](https://github.com/owncloud/media/issues)
       - [News](https://github.com/owncloud/news/issues)
       - [Notes](https://github.com/owncloud/notes/issues)
       - [Shorty](https://github.com/owncloud/shorty/issues)
-      - [other apps](https://github.com/owncloud/apps/issues) (e.g. Pictures, Music, Tasks, ...)
-
-If your issue appears to be a bug, and hasn't been reported, open a new issue.
+      - [All other apps](https://github.com/owncloud/apps/issues) (e.g. Pictures, Tasks, ...)
+* Report the issue using our [template][template], it includes all the information we need to track down the issue.
 
 Help us to maximize the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.
 
@@ -34,7 +38,7 @@ Thanks for wanting to contribute source code to ownCloud. That's great!
 
 Before we're able to merge your code into the ownCloud core, you need to sign our [Contributor Agreement][agreement].
 
-Please read the [Developer Manuals][devmanual] to get useful infos like how to create your first application or how to test the ownCloud code with phpunit.
+Please read the [Developer Manuals][devmanual] to learn how to create your first application or how to test the ownCloud code with PHPUnit.
 
 [agreement]: http://owncloud.org/about/contributor-agreement/
 [devmanual]: http://owncloud.org/dev/
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index f788949b1b6..108dcd741c6 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -63,8 +63,12 @@
 }
 #filestable { position: relative; top:37px; width:100%; }
 tbody tr { background-color:#fff; height:2.5em; }
-tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; }
-tbody tr.selected { background-color:#eee; }
+tbody tr:hover, tbody tr:active {
+	background-color: rgb(240,240,240);
+}
+tbody tr.selected {
+	background-color: rgb(230,230,230);
+}
 tbody a { color:#000; }
 span.extension, span.uploading, td.date { color:#999; }
 span.extension { text-transform:lowercase; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70); opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; }
@@ -81,7 +85,12 @@ table th#headerDate, table td.date { min-width:11em; padding:0 .1em 0 1em; text-
 /* Multiselect bar */
 #filestable.multiselect { top:63px; }
 table.multiselect thead { position:fixed; top:82px; z-index:1; -moz-box-sizing: border-box; box-sizing: border-box; left: 0; padding-left: 64px; width:100%; }
-table.multiselect thead th { background:rgba(230,230,230,.8); color:#000; font-weight:bold; border-bottom:0; }
+table.multiselect thead th {
+	background-color: rgba(210,210,210,.7);
+	color: #000;
+	font-weight: bold;
+	border-bottom: 0;
+}
 table.multiselect #headerName { width: 100%; }
 table td.selection, table th.selection, table td.fileaction { width:2em; text-align:center; }
 table td.filename a.name { display:block; height:1.5em; vertical-align:middle; margin-left:3em; }
@@ -115,10 +124,12 @@ table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
 }
 #fileList .name { position:relative; /* Firefox needs to explicitly have this default set … */ }
 #fileList tr:hover .fileactions { /* background to distinguish when overlaying with file names */
-	background:rgba(248,248,248,.9); box-shadow:-5px 0 7px rgba(248,248,248,.9);
+	background-color: rgba(240,240,240,0.898);
+	box-shadow: -5px 0 7px rgba(240,240,240,0.898);
 }
 #fileList tr.selected:hover .fileactions, #fileList tr.mouseOver .fileactions { /* slightly darker color for selected rows */
-	background:rgba(238,238,238,.9); box-shadow:-5px 0 7px rgba(238,238,238,.9);
+	background-color: rgba(230,230,230,.9);
+	box-shadow: -5px 0 7px rgba(230,230,230,.9);
 }
 #fileList .fileactions a.action img { position:relative; top:.2em; }
 #fileList a.action { display:inline; margin:-.5em 0; padding:1em .5em 1em .5em !important; }
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index c24d1fd8244..e19a35bbc5b 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -51,7 +51,7 @@ var FileList={
 		}else{
 			simpleSize=t('files', 'Pending');
 		}
-		var sizeColor = Math.round(200-Math.pow((size/(1024*1024)),2));
+		var sizeColor = Math.round(160-Math.pow((size/(1024*1024)),2));
 		var lastModifiedTime = Math.round(lastModified.getTime() / 1000);
 		td = $('<td></td>').attr({
 			"class": "filesize",
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index 879fbc8451f..542e0d05d60 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} mapper",
 "1 file" => "1 fil",
 "{count} files" => "{count} filer",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ugyldigt mappenavn. Brug af 'Shared' er forbeholdt af ownCloud",
 "Unable to rename file" => "Kunne ikke omdøbe fil",
 "Upload" => "Upload",
 "File handling" => "Filhåndtering",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index 171c95f7a0b..f4331761592 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -29,7 +29,7 @@
 "'.' is an invalid file name." => "'.' är ett ogiltigt filnamn.",
 "File name cannot be empty." => "Filnamn kan inte vara tomt.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet.",
-"Your storage is full, files can not be updated or synced anymore!" => "Ditt lagringsutrymme är fullt, filer kan ej längre laddas upp eller synkas!",
+"Your storage is full, files can not be updated or synced anymore!" => "Ditt lagringsutrymme är fullt, filer kan inte längre uppdateras eller synkroniseras!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Din nedladdning förbereds. Det kan ta tid om det är stora filer.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kan inte ladda upp din fil eftersom det är en katalog eller har 0 bytes",
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index 1719d25e660..1e94275dcba 100644
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -3,12 +3,12 @@
 <?php foreach($_['files'] as $file):
 	$simple_file_size = OCP\simple_file_size($file['size']);
 	// the bigger the file, the darker the shade of grey; megabytes*2
-	$simple_size_color = intval(200-$file['size']/(1024*1024)*2);
+	$simple_size_color = intval(160-$file['size']/(1024*1024)*2);
 	if($simple_size_color<0) $simple_size_color = 0;
 	$relative_modified_date = OCP\relative_modified_date($file['mtime']);
 	// the older the file, the brighter the shade of grey; days*14
 	$relative_date_color = round((time()-$file['mtime'])/60/60/24*14);
-	if($relative_date_color>200) $relative_date_color = 200;
+	if($relative_date_color>160) $relative_date_color = 160;
 	$name = rawurlencode($file['name']);
 	$name = str_replace('%2F', '/', $name);
 	$directory = rawurlencode($file['directory']);
diff --git a/apps/files_encryption/ajax/changeRecoveryPassword.php b/apps/files_encryption/ajax/changeRecoveryPassword.php
index b0594f967ba..366f634a51c 100644
--- a/apps/files_encryption/ajax/changeRecoveryPassword.php
+++ b/apps/files_encryption/ajax/changeRecoveryPassword.php
@@ -22,28 +22,28 @@ $return = false;
 $oldPassword = $_POST['oldPassword'];
 $newPassword = $_POST['newPassword'];
 
+$view = new \OC\Files\View('/');
 $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser());
 
-$result = $util->checkRecoveryPassword($oldPassword);
+$proxyStatus = \OC_FileProxy::$enabled;
+\OC_FileProxy::$enabled = false;
 
-if ($result) {
-	$keyId = $util->getRecoveryKeyId();
-	$keyPath = '/owncloud_private_key/' . $keyId . '.private.key';
-	$view = new \OC\Files\View('/');
+$keyId = $util->getRecoveryKeyId();
+$keyPath = '/owncloud_private_key/' . $keyId . '.private.key';
 
-	$proxyStatus = \OC_FileProxy::$enabled;
-	\OC_FileProxy::$enabled = false;
+$encryptedRecoveryKey = $view->file_get_contents($keyPath);
+$decryptedRecoveryKey = \OCA\Encryption\Crypt::decryptPrivateKey($encryptedRecoveryKey, $oldPassword);
+
+if ($decryptedRecoveryKey) {
 
-	$encryptedRecoveryKey = $view->file_get_contents($keyPath);
-	$decryptedRecoveryKey = \OCA\Encryption\Crypt::symmetricDecryptFileContent($encryptedRecoveryKey, $oldPassword);
 	$encryptedRecoveryKey = \OCA\Encryption\Crypt::symmetricEncryptFileContent($decryptedRecoveryKey, $newPassword);
 	$view->file_put_contents($keyPath, $encryptedRecoveryKey);
 
-	\OC_FileProxy::$enabled = $proxyStatus;
-
 	$return = true;
 }
 
+\OC_FileProxy::$enabled = $proxyStatus;
+
 // success or failure
 if ($return) {
 	\OCP\JSON::success(array('data' => array('message' => $l->t('Password successfully changed.'))));
diff --git a/apps/files_encryption/ajax/updatePrivateKeyPassword.php b/apps/files_encryption/ajax/updatePrivateKeyPassword.php
new file mode 100644
index 00000000000..6fd63dae9cd
--- /dev/null
+++ b/apps/files_encryption/ajax/updatePrivateKeyPassword.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * Copyright (c) 2013, Bjoern Schiessle <schiessle@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ *
+ * @brief Script to change recovery key password
+ *
+ */
+
+use OCA\Encryption;
+
+\OCP\JSON::checkLoggedIn();
+\OCP\JSON::checkAppEnabled('files_encryption');
+\OCP\JSON::callCheck();
+
+$l = OC_L10N::get('core');
+
+$return = false;
+
+$oldPassword = $_POST['oldPassword'];
+$newPassword = $_POST['newPassword'];
+
+$view = new \OC\Files\View('/');
+$session = new \OCA\Encryption\Session($view);
+$user = \OCP\User::getUser();
+
+$proxyStatus = \OC_FileProxy::$enabled;
+\OC_FileProxy::$enabled = false;
+
+$keyPath = '/' . $user . '/files_encryption/' . $user . '.private.key';
+
+$encryptedKey = $view->file_get_contents($keyPath);
+$decryptedKey = \OCA\Encryption\Crypt::decryptPrivateKey($encryptedKey, $oldPassword);
+
+if ($decryptedKey) {
+
+	$encryptedKey = \OCA\Encryption\Crypt::symmetricEncryptFileContent($decryptedKey, $newPassword);
+	$view->file_put_contents($keyPath, $encryptedKey);
+
+	$session->setPrivateKey($decryptedKey);
+
+	$return = true;
+}
+
+\OC_FileProxy::$enabled = $proxyStatus;
+
+// success or failure
+if ($return) {
+	\OCP\JSON::success(array('data' => array('message' => $l->t('Private key password successfully updated.'))));
+} else {
+	\OCP\JSON::error(array('data' => array('message' => $l->t('Could not update the private key password. Maybe the old password was not correct.'))));
+}
\ No newline at end of file
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index 99bdc2c2470..419bef1edef 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -10,45 +10,51 @@ OC::$CLASSPATH['OCA\Encryption\Session'] = 'files_encryption/lib/session.php';
 OC::$CLASSPATH['OCA\Encryption\Capabilities'] = 'files_encryption/lib/capabilities.php';
 OC::$CLASSPATH['OCA\Encryption\Helper'] = 'files_encryption/lib/helper.php';
 
-OC_FileProxy::register(new OCA\Encryption\Proxy());
+if (!OC_Config::getValue('maintenance', false)) {
+	OC_FileProxy::register(new OCA\Encryption\Proxy());
 
-// User related hooks
-OCA\Encryption\Helper::registerUserHooks();
+	// User related hooks
+	OCA\Encryption\Helper::registerUserHooks();
 
-// Sharing related hooks
-OCA\Encryption\Helper::registerShareHooks();
+	// Sharing related hooks
+	OCA\Encryption\Helper::registerShareHooks();
 
-// Filesystem related hooks
-OCA\Encryption\Helper::registerFilesystemHooks();
+	// Filesystem related hooks
+	OCA\Encryption\Helper::registerFilesystemHooks();
 
-stream_wrapper_register('crypt', 'OCA\Encryption\Stream');
+	stream_wrapper_register('crypt', 'OCA\Encryption\Stream');
 
-// check if we are logged in
-if (OCP\User::isLoggedIn()) {
+	// check if we are logged in
+	if (OCP\User::isLoggedIn()) {
 
-	// ensure filesystem is loaded
-	if(!\OC\Files\Filesystem::$loaded) {
-		\OC_Util::setupFS();
-	}
+		// ensure filesystem is loaded
+		if (!\OC\Files\Filesystem::$loaded) {
+			\OC_Util::setupFS();
+		}
 
-	$view = new OC_FilesystemView('/');
-	$session = new \OCA\Encryption\Session($view);
+		$view = new OC_FilesystemView('/');
+		$session = new \OCA\Encryption\Session($view);
 
-	// check if user has a private key
-	if (
-		!$session->getPrivateKey(\OCP\USER::getUser())
-		&& OCA\Encryption\Crypt::mode() === 'server'
-	) {
+		$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'
+		) {
 
-		// Force the user to log-in again if the encryption key isn't unlocked
-		// (happens when a user is logged in before the encryption app is
-		// enabled)
-		OCP\User::logout();
+			// Force the user to log-in again if the encryption key isn't unlocked
+			// (happens when a user is logged in before the encryption app is
+			// enabled)
+			OCP\User::logout();
 
-		header("Location: " . OC::$WEBROOT . '/');
+			header("Location: " . OC::$WEBROOT . '/');
 
-		exit();
+			exit();
+		}
 	}
+} else {
+	// logout user if we are in maintenance to force re-login
+	OCP\User::logout();
 }
 
 // Register settings scripts
diff --git a/apps/files_encryption/files/error.php b/apps/files_encryption/files/error.php
new file mode 100644
index 00000000000..63c74e4e797
--- /dev/null
+++ b/apps/files_encryption/files/error.php
@@ -0,0 +1,24 @@
+<?php
+if (!isset($_)) { //also provide standalone error page
+	require_once '../../../lib/base.php';
+
+	$l = OC_L10N::get('files_encryption');
+
+	$errorMsg = $l->t('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');
+
+	if(isset($_GET['p']) && $_GET['p'] === '1') {
+		header('HTTP/1.0 404 ' . $errorMsg);
+	}
+
+	// check if ajax request
+	if(!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') {
+		\OCP\JSON::error(array('data' => array('message' => $errorMsg)));
+	} else {
+		header('HTTP/1.0 404 ' . $errorMsg);
+		$tmpl = new OC_Template('files_encryption', 'invalid_private_key', 'guest');
+		$tmpl->printPage();
+	}
+
+	exit;
+}
+?>
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index d1b08a0b978..7698b95cfd3 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -60,17 +60,25 @@ class Hooks {
 

 		$encryptedKey = Keymanager::getPrivateKey($view, $params['uid']);

 

-		$privateKey = Crypt::symmetricDecryptFileContent($encryptedKey, $params['password']);

+		$privateKey = Crypt::decryptPrivateKey($encryptedKey, $params['password']);

+

+		if ($privateKey === false) {

+			\OCP\Util::writeLog('Encryption library', 'Private key for user "' . $params['uid']

+													  . '" is not valid! Maybe the user password was changed from outside if so please change it back to gain access', \OCP\Util::ERROR);

+		}

 

 		$session = new \OCA\Encryption\Session($view);

 

-		$session->setPrivateKey($privateKey, $params['uid']);

+		$session->setPrivateKey($privateKey);

 

 		// Check if first-run file migration has already been performed

-		$migrationCompleted = $util->getMigrationStatus();

+		$ready = false;

+		if ($util->getMigrationStatus() === Util::MIGRATION_OPEN) {

+			$ready = $util->beginMigration();

+		}

 

 		// If migration not yet done

-		if (!$migrationCompleted) {

+		if ($ready) {

 

 			$userView = new \OC_FilesystemView('/' . $params['uid']);

 

@@ -81,7 +89,7 @@ class Hooks {
 				&& $encLegacyKey = $userView->file_get_contents('encryption.key')

 			) {

 

-				$plainLegacyKey = Crypt::legacyBlockDecrypt($encLegacyKey, $params['password']);

+				$plainLegacyKey = Crypt::legacyDecrypt($encLegacyKey, $params['password']);

 

 				$session->setLegacyKey($plainLegacyKey);

 

@@ -102,7 +110,7 @@ class Hooks {
 			}

 

 			// Register successful migration in DB

-			$util->setMigrationStatus(1);

+			$util->finishMigration();

 

 		}

 

@@ -142,13 +150,22 @@ class Hooks {
 	}

 

 	/**

+	 * @brief If the password can't be changed within ownCloud, than update the key password in advance.

+	 */

+	public static function preSetPassphrase($params) {

+		if ( ! \OC_User::canUserChangePassword($params['uid']) ) {

+			self::setPassphrase($params);

+		}

+	}

+

+	/**

 	 * @brief Change a user's encryption passphrase

 	 * @param array $params keys: uid, password

 	 */

 	public static function setPassphrase($params) {

 

 		// Only attempt to change passphrase if server-side encryption

-		// is in use (client-side encryption does not have access to 

+		// is in use (client-side encryption does not have access to

 		// the necessary keys)

 		if (Crypt::mode() === 'server') {

 

@@ -333,7 +350,7 @@ class Hooks {
 			$sharingEnabled = \OCP\Share::isEnabled();

 

 			// get the path including mount point only if not a shared folder

-			if(strncmp($path, '/Shared' , strlen('/Shared') !== 0)) {

+			if (strncmp($path, '/Shared', strlen('/Shared') !== 0)) {

 				// get path including the the storage mount point

 				$path = $util->getPathWithMountPoint($params['itemSource']);

 			}

@@ -410,14 +427,14 @@ class Hooks {
 			}

 

 			// get the path including mount point only if not a shared folder

-			if(strncmp($path, '/Shared' , strlen('/Shared') !== 0)) {

+			if (strncmp($path, '/Shared', strlen('/Shared') !== 0)) {

 				// get path including the the storage mount point

 				$path = $util->getPathWithMountPoint($params['itemSource']);

 			}

 

 			// if we unshare a folder we need a list of all (sub-)files

 			if ($params['itemType'] === 'folder') {

-				$allFiles = $util->getAllFiles( $path );

+				$allFiles = $util->getAllFiles($path);

 			} else {

 				$allFiles = array($path);

 			}

diff --git a/apps/files_encryption/js/settings-personal.js b/apps/files_encryption/js/settings-personal.js
index 312b672ad46..d6535a25b70 100644
--- a/apps/files_encryption/js/settings-personal.js
+++ b/apps/files_encryption/js/settings-personal.js
@@ -4,7 +4,25 @@
  * See the COPYING-README file.
  */
 
+function updatePrivateKeyPasswd() {
+	var oldPrivateKeyPassword = $('input:password[id="oldPrivateKeyPassword"]').val();
+	var newPrivateKeyPassword = $('input:password[id="newPrivateKeyPassword"]').val();
+	OC.msg.startSaving('#encryption .msg');
+	$.post(
+	OC.filePath( 'files_encryption', 'ajax', 'updatePrivateKeyPassword.php' )
+		, { oldPassword: oldPrivateKeyPassword, newPassword: newPrivateKeyPassword }
+		,  function( data ) {
+			if (data.status === "error") {
+				OC.msg.finishedSaving('#encryption .msg', data);
+			} else {
+				OC.msg.finishedSaving('#encryption .msg', data);
+			}
+		}
+	);
+}
+
 $(document).ready(function(){
+
 	// Trigger ajax on recoveryAdmin status change
 	$( 'input:radio[name="userEnableRecovery"]' ).change( 
 		function() {
@@ -57,4 +75,24 @@ $(document).ready(function(){
 		}
 		
 	);
+
+	// update private key password
+
+	$('input:password[name="changePrivateKeyPassword"]').keyup(function(event) {
+		var oldPrivateKeyPassword = $('input:password[id="oldPrivateKeyPassword"]').val();
+		var newPrivateKeyPassword = $('input:password[id="newPrivateKeyPassword"]').val();
+		if (newPrivateKeyPassword !== '' && oldPrivateKeyPassword !== '' ) {
+			$('button:button[name="submitChangePrivateKeyPassword"]').removeAttr("disabled");
+			if(event.which === 13) {
+				updatePrivateKeyPasswd();
+			}
+		} else {
+			$('button:button[name="submitChangePrivateKeyPassword"]').attr("disabled", "true");
+		}
+	});
+
+	$('button:button[name="submitChangePrivateKeyPassword"]').click(function() {
+		updatePrivateKeyPasswd();
+	});
+
 });
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index 5db1d7e58c5..17a073c1c69 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -5,7 +5,13 @@
 "Could not disable recovery key. Please check your recovery key password!" => "No s'ha pogut desactivar la calu de recuperació. Comproveu la contrasenya de la clau de recuperació!",
 "Password successfully changed." => "La contrasenya s'ha canviat.",
 "Could not change the password. Maybe the old password was not correct." => "No s'ha pogut canviar la contrasenya. Potser la contrasenya anterior no era correcta.",
+"Private key password successfully updated." => "La contrasenya de la clau privada s'ha actualitzat.",
+"Could not update the private key password. Maybe the old password was not correct." => "No s'ha pogut actualitzar la contrasenya de la clau privada. Potser la contrasenya anterior no era 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" => "La clau privada no és vàlida! Potser la contrasenya ha canviat des de fora. Podeu actualitzar la contrasenya de la clau privada a l'arranjament personal per obtenir de nou accés als vostres fitxers",
 "Saving..." => "Desant...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "La vostra clau privada no és vàlida! Potser la vostra contrasenya ha canviat des de fora.",
+"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",
@@ -15,8 +21,14 @@
 "Old Recovery account password" => "Contrasenya de recuperació anterior",
 "New Recovery account password" => "Nova contrasenya de recuperació de compte",
 "Change Password" => "Canvia la contrasenya",
-"Enable password recovery by sharing all files with your administrator:" => "Activa la recuperació de contrasenya compartint tots els fitxers amb l'administrador:",
-"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Activant aquesta opció us permetrà obtenir de nou accés als fitxers encriptats si perdeu 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.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Si no recordeu la contrasenya anterior podeu demanar a l'administrador que recuperi els vostres fitxers.",
+"Old log-in password" => "Contrasenya anterior d'accés",
+"Current log-in password" => "Contrasenya d'accés actual",
+"Update Private Key Password" => "Actualitza la contrasenya de clau privada",
+"Enable password recovery:" => "Habilita la recuperació de contrasenya:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Activar aquesta opció us permetrà obtenir de nou accés als vostres fitxers encriptats en cas de perdre la contrasenya",
 "File recovery settings updated" => "S'han  actualitzat els arranjaments de recuperació de fitxers",
 "Could not update file recovery" => "No s'ha pogut actualitzar la recuperació de fitxers"
 );
diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
index e8c365972ca..a005141ce0c 100644
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -5,6 +5,9 @@
 "Could not disable recovery key. Please check your recovery key password!" => "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo vašeho záchranného klíče.",
 "Password successfully changed." => "Heslo bylo úspěšně změněno.",
 "Could not change the password. Maybe the old password was not correct." => "Nelze změnit heslo. Pravděpodobně nebylo stávající heslo zadáno správně.",
+"Private key password successfully updated." => "Heslo soukromého klíče úspěšně aktualizováno.",
+"Could not update the private key password. Maybe the old password was not correct." => "Nelze aktualizovat heslo soukromého klíče. Možná nebylo staré heslo správně.",
+"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íč):",
@@ -15,8 +18,8 @@
 "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 by sharing all files with your administrator:" => "Povolit obnovu hesla sdílením všech souborů s vaším správcem:",
-"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Povolení vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte 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",
 "File recovery settings updated" => "Možnosti obnovy souborů aktualizovány",
 "Could not update file recovery" => "Nelze aktualizovat obnovu souborů"
 );
diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
index 18fe7df6487..f5dd0dc1e24 100644
--- a/apps/files_encryption/l10n/de.php
+++ b/apps/files_encryption/l10n/de.php
@@ -12,6 +12,5 @@
 "Disabled" => "Deaktiviert",
 "Change encryption passwords recovery key:" => "Wiederherstellungsschlüssel für Passwörter ändern:",
 "Change Password" => "Passwort ändern",
-"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Wenn Sie diese Einstellung aktivieren, können Sie auch im Falle des Verlustes Ihres Passworts auf verschlüsselte Dateien zugreifen",
 "File recovery settings updated" => "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert"
 );
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index 48bf3a89a24..b12bda42f84 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -13,8 +13,6 @@
 "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",
-"Enable password recovery by sharing all files with your administrator:" => "Aktiviere die Wiederherstellung deines Passwortes durch das Teilen aller Dateien mit dem Administrator:",
-"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben.",
 "File recovery settings updated" => "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
 "Could not update file recovery" => "Die Dateiwiederherstellung konnte nicht aktualisiert werden."
 );
diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php
index 7067799cd2e..7bf9be11a01 100644
--- a/apps/files_encryption/l10n/el.php
+++ b/apps/files_encryption/l10n/el.php
@@ -1,4 +1,11 @@
 <?php $TRANSLATIONS = array(
+"Password successfully changed." => "Ο κωδικός αλλάχτηκε επιτυχώς.",
+"Could not change the password. Maybe the old password was not correct." => "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός.",
 "Saving..." => "Γίνεται αποθήκευση...",
-"Encryption" => "Κρυπτογράφηση"
+"Encryption" => "Κρυπτογράφηση",
+"Recovery account password" => "Επαναφορά κωδικού πρόσβασης λογαριασμού",
+"Enabled" => "Ενεργοποιημένο",
+"Disabled" => "Απενεργοποιημένο",
+"Change Password" => "Αλλαγή Κωδικού Πρόσβασης",
+"File recovery settings updated" => "Οι ρυθμίσεις επαναφοράς αρχείων ανανεώθηκαν"
 );
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index 58adbd716a8..5ba3e36b1ac 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -5,6 +5,7 @@
 "Could not disable recovery key. Please check your recovery key password!" => "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!",
 "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.",
 "Saving..." => "Guardando...",
 "Encryption" => "Cifrado",
 "Enable encryption passwords recovery key (allow sharing to recovery key):" => "Habilitar clave de recuperación de contraseñas ():",
@@ -15,8 +16,6 @@
 "Old Recovery account password" => "Contraseña de recuperación actual",
 "New Recovery account password" => "Contraseña de recuperación nueva",
 "Change Password" => "Cambiar contraseña",
-"Enable password recovery by sharing all files with your administrator:" => "Habilitar recuperación de contraseña compartiendo todos los archivos con su administrador",
-"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Habilitar esta opción para poder acceder a sus archivos cifrados si pierde su 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"
 );
diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php
index 857186a55fa..9d003a37515 100644
--- a/apps/files_encryption/l10n/es_AR.php
+++ b/apps/files_encryption/l10n/es_AR.php
@@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"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.",
 "Saving..." => "Guardando...",
-"Encryption" => "Encriptación"
+"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"
 );
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index e762647f782..e24da6ac678 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -15,8 +15,6 @@
 "Old Recovery account password" => "Konto vana taaste parool",
 "New Recovery account password" => "Konto uus taasteparool",
 "Change Password" => "Muuda parooli",
-"Enable password recovery by sharing all files with your administrator:" => "Luba parooli taaste jagades kõik failid administraatoriga:",
-"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parool on kadunud",
 "File recovery settings updated" => "Faili taaste seaded uuendatud",
 "Could not update file recovery" => "Ei suuda uuendada taastefaili"
 );
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index af4fd1a893f..24bb81e8cfb 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -5,7 +5,11 @@
 "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!",
 "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.",
 "Saving..." => "Enregistrement...",
+"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 ",
@@ -15,8 +19,10 @@
 "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 Password" => "Changer de mot de passe",
-"Enable password recovery by sharing all files with your administrator:" => "Activer la récupération des mots de passe en partageant les fichiers avec votre administrateur:",
-"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "En activant cette option cela vous autorisera à récupérer votre accès aux fichiers cryptés si votre mot de passe est perdu",
+"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 ",
 "Could not update file recovery" => "Ne peut pas remettre à jour les fichiers de récupération"
 );
diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php
index ca93efba9aa..6fc6abccefe 100644
--- a/apps/files_encryption/l10n/gl.php
+++ b/apps/files_encryption/l10n/gl.php
@@ -5,7 +5,13 @@
 "Could not disable recovery key. Please check your recovery key password!" => "Non foi posíbel desactivar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
 "Password successfully changed." => "O contrasinal foi cambiado satisfactoriamente",
 "Could not change the password. Maybe the old password was not correct." => "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o  correcto.",
+"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",
 "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",
@@ -15,8 +21,14 @@
 "Old Recovery account password" => "Antigo contrasinal de recuperación da conta",
 "New Recovery account password" => "Novo contrasinal de recuperación da conta",
 "Change Password" => "Cambiar o contrasinal",
-"Enable password recovery by sharing all files with your administrator:" => "Activar a recuperación de contrasinais compartindo todos os ficheiros co administrador:",
-"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Ao activar esta opción permitiráselle volver a obter acceso aos ficheiros cifrados se perde 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",
+" If you don't remember your old password you can ask your administrator to recover your files." => " Se non lembra o seu antigo contrasinal pode pedírllelo ao seu administrador para recuperar os seus ficheiros.",
+"Old log-in password" => "Contrasinal de acceso antigo",
+"Current log-in password" => "Contrasinal de acceso actual",
+"Update Private Key Password" => "Actualizar o contrasinal da chave privada",
+"Enable password recovery:" => "Activar o  contrasinal de recuperación:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Ao activar esta opción permitiráselle volver a obter acceso aos ficheiros cifrados no caso de perda do contrasinal",
 "File recovery settings updated" => "Actualizouse o ficheiro de axustes de recuperación",
 "Could not update file recovery" => "Non foi posíbel actualizar o ficheiro de recuperación"
 );
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index 63ae4b70b44..3226a17ee99 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -5,7 +5,13 @@
 "Could not disable recovery key. Please check your recovery key password!" => "Impossibile disabilitare la chiave di ripristino. Verifica la password della chiave di ripristino.",
 "Password successfully changed." => "Password modificata correttamente.",
 "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.",
 "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",
 "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",
@@ -15,8 +21,14 @@
 "Old Recovery account password" => "Vecchia password di ripristino dell'account",
 "New Recovery account password" => "Nuova password di ripristino dell'account",
 "Change Password" => "Modifica password",
-"Enable password recovery by sharing all files with your administrator:" => "Abilita il ripristino della password condividendo tutti i file con l'amministratore:",
-"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "L'abilitazione di questa opzione ti consentirà di ottenere nuovamente accesso ai tuoi file cifrati in caso di smarrimento della 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",
 "File recovery settings updated" => "Impostazioni di ripristino dei file aggiornate",
 "Could not update file recovery" => "Impossibile aggiornare il ripristino dei file"
 );
diff --git a/apps/files_encryption/l10n/ja_JP.php b/apps/files_encryption/l10n/ja_JP.php
index 6d2d3e249c0..29c2a97cdbd 100644
--- a/apps/files_encryption/l10n/ja_JP.php
+++ b/apps/files_encryption/l10n/ja_JP.php
@@ -5,7 +5,13 @@
 "Could not disable recovery key. Please check your recovery key password!" => "リカバリ用のキーを無効化できませんでした。リカバリ用のキーのパスワードを確認して下さい！",
 "Password successfully changed." => "パスワードを変更できました。",
 "Could not change the password. Maybe the old password was not correct." => "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
+"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" => "秘密鍵が有効ではありません。パスワードが外部から変更された恐れがあります。。個人設定で秘密鍵のパスワードを更新して、ファイルへのアクセス権を奪還できます。",
 "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" => "復旧アカウントのパスワード",
@@ -15,8 +21,14 @@
 "Old Recovery account password" => "古い復旧アカウントのパスワード",
 "New Recovery account password" => "新しい復旧アカウントのパスワード",
 "Change Password" => "パスワードを変更",
-"Enable password recovery by sharing all files with your administrator:" => "管理者が全ての共有ファイルに対してパスワードによる復旧を有効にする:",
-"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "このオプションを有効にすると、もしパスワードが分からなくなったとしても、暗号化されたファイルに再度アクセスすることが出来るようになります。",
+"Your private key password no longer match your log-in password:" => "もはや秘密鍵はログインパスワードと一致しません:",
+"Set your old private key password to your current log-in password." => "古い秘密鍵のパスワードを現在のログインパスワードに設定する。",
+" If you don't remember your old password you can ask your administrator to recover your files." => "古いパスワードを覚えていない場合、管理者に尋ねてファイルを回復することができます。",
+"Old log-in password" => "古いログインパスワード",
+"Current log-in password" => "現在のログインパスワード",
+"Update Private Key Password" => "秘密鍵のパスワードを更新",
+"Enable password recovery:" => "パスワード復旧を有効化:",
+"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" => "ファイル復旧を更新できませんでした"
 );
diff --git a/apps/files_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php
index 8e9d02c3b13..16c6cdb40f0 100644
--- a/apps/files_encryption/l10n/lt_LT.php
+++ b/apps/files_encryption/l10n/lt_LT.php
@@ -15,8 +15,6 @@
 "Old Recovery account password" => "Seno atstatymo vartotojo slaptažodis",
 "New Recovery account password" => "naujo atstatymo vartotojo slaptažodis",
 "Change Password" => "Pakeisti slaptažodį",
-"Enable password recovery by sharing all files with your administrator:" => "Įjungti slaptažodžio atkūrimą dalinantis visais failas su administratoriumi:",
-"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Įjungus šią funkciją jums bus suteiktas priėjimas prie šifruotos informacijos ir pamiršus slaptažodį.",
 "File recovery settings updated" => "Failų atstatymo nustatymai pakeisti",
 "Could not update file recovery" => "Neišėjo atnaujinti failų atkūrimo"
 );
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index 9c462917cf3..93900c71029 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -6,6 +6,9 @@
 "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.",
 "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",
@@ -15,8 +18,12 @@
 "Old Recovery account password" => "Oude herstel account wachtwoord",
 "New Recovery account password" => "Nieuwe herstel account wachtwoord",
 "Change Password" => "Wijzigen wachtwoord",
-"Enable password recovery by sharing all files with your administrator:" => "Activeer wachtwoordherstel door alle bestanden met uw beheerder te delen:",
-"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Door deze optie te activeren kunt u toegang tot uw versleutelde bestanden krijgen als u uw wachtwoord kwijt bent",
+" 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",
+"Update Private Key Password" => "Bijwerken wachtwoord Privésleutel",
+"Enable password recovery:" => "Activeren wachtwoord herstel:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Het activeren van deze optie maakt het mogelijk om uw versleutelde bestanden te benaderen als uw wachtwoord kwijt is",
 "File recovery settings updated" => "Bestandsherstel instellingen bijgewerkt",
 "Could not update file recovery" => "Kon bestandsherstel niet bijwerken"
 );
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index a6f90db4cd8..f840aa7ddac 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -11,8 +11,6 @@
 "Old Recovery account password" => "Stare hasło odzyskiwania",
 "New Recovery account password" => "Nowe hasło odzyskiwania",
 "Change Password" => "Zmień hasło",
-"Enable password recovery by sharing all files with your administrator:" => "Włączyć hasło odzyskiwania przez udostępnianie wszystkich plików z administratorem:",
-"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Włączenie tej opcji umożliwia otrzymać dostęp do zaszyfrowanych plików w przypadku utraty hasła",
 "File recovery settings updated" => "Ustawienia odzyskiwania plików zmienione",
 "Could not update file recovery" => "Nie można zmienić pliku odzyskiwania"
 );
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index e5fa0b55cad..868dfc4453c 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -15,8 +15,6 @@
 "Old Recovery account password" => "Recuperação de senha de conta antiga",
 "New Recovery account password" => "Senha Nova  da conta de Recuperação",
 "Change Password" => "Trocar Senha",
-"Enable password recovery by sharing all files with your administrator:" => "Habilitar recuperação de senha através da partilha de todos os arquivos com o administrador:",
-"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Ativando esta opção irá permitir que você reobtainha acesso aos seus arquivos criptografados se sua senha for perdida",
 "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"
 );
diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index e1bb17ecaa7..8993cb63699 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -1,9 +1,20 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Chave de recuperação activada com sucesso",
+"Could not enable recovery key. Please check your recovery key password!" => "Não foi possível activar a chave de recuperação. Por favor verifique a password da chave de recuperação!",
+"Recovery key successfully disabled" => "Chave de recuperação descativada com sucesso",
+"Could not disable recovery key. Please check your recovery key password!" => "Não foi possível desactivar a chave de recuperação. Por favor verifique a password da chave de recuperação.",
 "Password successfully changed." => "Password alterada com sucesso.",
 "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 Password" => "Mudar a Password"
+"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"
 );
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index aaf7f0997c3..d10bfa7e783 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -11,8 +11,6 @@
 "Old Recovery account password" => "Старое Восстановление пароля учетной записи",
 "New Recovery account password" => "Новое Восстановление пароля учетной записи",
 "Change Password" => "Изменить пароль",
-"Enable password recovery by sharing all files with your administrator:" => "Включить восстановление пароля путем доступа Вашего администратора ко всем файлам",
-"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Включение этой опции позволит вам получить доступ к зашифрованным файлам, в случае утери пароля",
 "File recovery settings updated" => "Настройки файла восстановления обновлены",
 "Could not update file recovery" => "Невозможно обновить файл восстановления"
 );
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index efcfc105073..7d17a0adc60 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -5,7 +5,13 @@
 "Could not disable recovery key. Please check your recovery key password!" => "Kunde inte inaktivera återställningsnyckeln. Vänligen kontrollera ditt lösenord för återställningsnyckeln!",
 "Password successfully changed." => "Ändringen av lösenordet lyckades.",
 "Could not change the password. Maybe the old password was not correct." => "Kunde inte ändra lösenordet. Kanske det gamla lösenordet inte var rätt.",
+"Private key password successfully updated." => "Den privata lösenordsnyckeln uppdaterades utan problem.",
+"Could not update the private key password. Maybe the old password was not correct." => "Kunde inte uppdatera den privata lösenordsnyckeln. Kanske var det gamla lösenordet fel.",
+"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "Din privata lösenordsnyckel är inte giltig! Kanske byttes ditt lösenord från utsidan. Du kan uppdatera din privata lösenordsnyckel under dina personliga inställningar för att återfå tillgång till dina filer",
 "Saving..." => "Sparar...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Din privata lösenordsnyckel är inte giltig! Kanske byttes ditt lösenord från utsidan.",
+"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",
@@ -15,8 +21,13 @@
 "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",
-"Enable password recovery by sharing all files with your administrator:" => "Aktivera lösenordsåterställning genom att dela alla filer med din administratör:",
-"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Aktivera det här alternativet för att kunna återfå tillgång till dina krypterade filer om du skulle förlora/glömma ditt 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.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Om du inte kommer ihåg ditt gamla lösenord kan du be din administratör att återställa dina filer.",
+"Old log-in password" => "Gammalt inloggningslösenord",
+"Current log-in password" => "Nuvarande inloggningslösenord",
+"Update Private Key Password" => "Uppdatera den privata lösenordsnyckeln",
+"Enable password recovery:" => "Aktivera lösenordsåterställning",
 "File recovery settings updated" => "Inställningarna för filåterställning har uppdaterats",
 "Could not update file recovery" => "Kunde inte uppdatera filåterställning"
 );
diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php
index fc0847ed85d..59b91de928a 100644
--- a/apps/files_encryption/l10n/tr.php
+++ b/apps/files_encryption/l10n/tr.php
@@ -15,8 +15,6 @@
 "Old Recovery account password" => "Eski kurtarma hesabı parolası",
 "New Recovery account password" => "Yeni kurtarma hesabı parolası",
 "Change Password" => "Parola değiştir",
-"Enable password recovery by sharing all files with your administrator:" => "Parola kurtarmasını tüm paylaşılan dosyaları sistem yöneticiniz ile paylaşarak kurtarmayı etkinleştir:",
-"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "Bu seçeneği etkinleştirmekle eğer parolanızı kaybederseniz şifreli dosyalara erişimi elde etmiş olursunuz",
 "File recovery settings updated" => "Dosya kurtarma ayarları güncellendi",
 "Could not update file recovery" => "Dosya kurtarma güncellenemedi"
 );
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
index 59582e6fd52..c64ae9dcd48 100644
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -15,8 +15,6 @@
 "Old Recovery account password" => "旧恢复账号密码",
 "New Recovery account password" => "新恢复账号密码",
 "Change Password" => "修改密码",
-"Enable password recovery by sharing all files with your administrator:" => "通过与系统管理员共享全部文件启用密码恢复：",
-"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "启用该选项将允许你丢失密码时重新取得加密过的文件。",
 "File recovery settings updated" => "文件恢复设置已更新",
 "Could not update file recovery" => "不能更新文件恢复"
 );
diff --git a/apps/files_encryption/l10n/zh_TW.php b/apps/files_encryption/l10n/zh_TW.php
index faea3f54a18..77efdb3e566 100644
--- a/apps/files_encryption/l10n/zh_TW.php
+++ b/apps/files_encryption/l10n/zh_TW.php
@@ -7,8 +7,6 @@
 "Disabled" => "已停用",
 "Change encryption passwords recovery key:" => "變更加密密碼還原金鑰：",
 "Change Password" => "變更密碼",
-"Enable password recovery by sharing all files with your administrator:" => "與管理員分享所有檔案以啓用密碼還原功能：",
-"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "啓用此選項允許您未來遺失密碼時重新取得已加密的檔案",
 "File recovery settings updated" => "檔案還原設定已更新",
 "Could not update file recovery" => "無法更新檔案還原設定"
 );
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index ddeb3590f60..945b342a316 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -168,7 +168,7 @@ class Crypt {
 	 *        e.g. filename or /Docs/filename, NOT admin/files/filename

 	 * @return boolean

 	 */

-	public static function isLegacyEncryptedContent($data, $relPath) {

+	public static function isLegacyEncryptedContent($isCatFileContent, $relPath) {

 

 		// Fetch all file metadata from DB

 		$metadata = \OC\Files\Filesystem::getFileInfo($relPath, '');

@@ -178,7 +178,7 @@ class Crypt {
 		// legacy encryption system

 		if (isset($metadata['encrypted'])

 			&& $metadata['encrypted'] === true

-			&& !self::isCatfileContent($data)

+			&& $isCatFileContent === false

 		) {

 

 			return true;

@@ -352,6 +352,34 @@ class Crypt {
 	}

 

 	/**

+	 * @brief Decrypt private key and check if the result is a valid keyfile

+	 * @param string $encryptedKey encrypted keyfile

+	 * @param string $passphrase to decrypt keyfile

+	 * @returns encrypted private key or false

+	 *

+	 * This function decrypts a file

+	 */

+	public static function decryptPrivateKey($encryptedKey, $passphrase) {

+

+		$plainKey = self::symmetricDecryptFileContent($encryptedKey, $passphrase);

+

+		// check if this a valid private key

+		$res = openssl_pkey_get_private($plainKey);

+		if (is_resource($res)) {

+			$sslInfo = openssl_pkey_get_details($res);

+			if (!isset($sslInfo['key'])) {

+				$plainKey = false;

+			}

+		} else {

+			$plainKey = false;

+		}

+

+		return $plainKey;

+

+	}

+

+

+	/**

 	 * @brief Creates symmetric keyfile content using a generated key

 	 * @param string $plainContent content to be encrypted

 	 * @returns array keys: key, encrypted

@@ -452,7 +480,7 @@ class Crypt {
 

 		} else {

 

-			\OCP\Util::writeLog('Encryption library', 'Decryption (asymmetric) of sealed content failed', \OCP\Util::ERROR);

+			\OCP\Util::writeLog('Encryption library', 'Decryption (asymmetric) of sealed content with share-key "'.$shareKey.'" failed', \OCP\Util::ERROR);

 

 			return false;

 

@@ -608,7 +636,7 @@ class Crypt {
 	 *

 	 * This function decrypts an content

 	 */

-	private static function legacyDecrypt($content, $passphrase = '') {

+	public static function legacyDecrypt($content, $passphrase = '') {

 

 		$bf = self::getBlowfish($passphrase);

 

@@ -637,28 +665,4 @@ class Crypt {
 		}

 	}

 

-	/**

-	 * @param $legacyEncryptedContent

-	 * @param $legacyPassphrase

-	 * @param $publicKeys

-	 * @return array

-	 */

-	public static function legacyKeyRecryptKeyfile($legacyEncryptedContent, $legacyPassphrase, $publicKeys) {

-

-		$decrypted = self::legacyBlockDecrypt($legacyEncryptedContent, $legacyPassphrase);

-

-		// Encrypt plain data, generate keyfile & encrypted file

-		$cryptedData = self::symmetricEncryptFileContentKeyfile($decrypted);

-

-		// Encrypt plain keyfile to multiple sharefiles

-		$multiEncrypted = Crypt::multiKeyEncrypt($cryptedData['key'], $publicKeys);

-

-		return array(

-			'data' => $cryptedData['encrypted'],

-			'filekey' => $multiEncrypted['data'],

-			'sharekeys' => $multiEncrypted['keys']

-		);

-

-	}

-

 }
\ No newline at end of file
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index e078ab35541..a22c139c503 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -48,6 +48,7 @@ class Helper {
 
 		\OCP\Util::connectHook('OC_User', 'post_login', 'OCA\Encryption\Hooks', 'login');
 		\OCP\Util::connectHook('OC_User', 'post_setPassword', 'OCA\Encryption\Hooks', 'setPassphrase');
+		\OCP\Util::connectHook('OC_User', 'pre_setPassword', 'OCA\Encryption\Hooks', 'preSetPassphrase');
 		\OCP\Util::connectHook('OC_User', 'post_createUser', 'OCA\Encryption\Hooks', 'postCreateUser');
 		\OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OCA\Encryption\Hooks', 'postDeleteUser');
 	}
@@ -73,7 +74,7 @@ class Helper {
 		if (!$util->ready()) {
 
 			\OCP\Util::writeLog('Encryption library', 'User account "' . $util->getUserId()
-												 . '" is not ready for encryption; configuration started', \OCP\Util::DEBUG);
+													  . '" is not ready for encryption; configuration started', \OCP\Util::DEBUG);
 
 			if (!$util->setupServerSide($password)) {
 				return false;
@@ -93,6 +94,7 @@ class Helper {
 	 * @return bool
 	 */
 	public static function adminEnableRecovery($recoveryKeyId, $recoveryPassword) {
+
 		$view = new \OC\Files\View('/');
 
 		if ($recoveryKeyId === null) {
@@ -127,13 +129,6 @@ class Helper {
 			// Save private key
 			$view->file_put_contents('/owncloud_private_key/' . $recoveryKeyId . '.private.key', $encryptedPrivateKey);
 
-			// create control file which let us check later on if the entered password was correct.
-			$encryptedControlData = \OCA\Encryption\Crypt::keyEncrypt("ownCloud", $keypair['publicKey']);
-			if (!$view->is_dir('/control-file')) {
-				$view->mkdir('/control-file');
-			}
-			$view->file_put_contents('/control-file/controlfile.enc', $encryptedControlData);
-
 			\OC_FileProxy::$enabled = true;
 
 			// Set recoveryAdmin as enabled
@@ -200,4 +195,17 @@ class Helper {
 
 		return $relPath;
 	}
+
+	/**
+	 * @brief redirect to a error page
+	 */
+	public static function redirectToErrorPage() {
+		$location = \OC_Helper::linkToAbsolute('apps/files_encryption/files', 'error.php');
+		$post = 0;
+		if(count($_POST) > 0) {
+			$post = 1;
+		}
+		header('Location: ' . $location . '?p=' . $post);
+		exit();
+	}
 }
\ No newline at end of file
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 0df34a38bd7..735eba911a9 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -256,6 +256,8 @@ class Proxy extends \OC_FileProxy {
 	 */
 	public function postFopen($path, &$result) {
 
+		$path = \OC\Files\Filesystem::normalizePath($path);
+
 		if (!$result) {
 
 			return $result;
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index bff1737554b..1911386cd12 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -88,9 +88,10 @@ class Session {
 			$proxyStatus = \OC_FileProxy::$enabled;
 			\OC_FileProxy::$enabled = false;
 
-			$encryptedKey = $this->view->file_get_contents( '/owncloud_private_key/' . $publicShareKeyId . '.private.key' );
-			$privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, '' );
-			$this->setPublicSharePrivateKey( $privateKey );
+			$encryptedKey = $this->view->file_get_contents(
+				'/owncloud_private_key/' . $publicShareKeyId . '.private.key');
+			$privateKey = Crypt::decryptPrivateKey($encryptedKey, '');
+			$this->setPublicSharePrivateKey($privateKey);
 
 			\OC_FileProxy::$enabled = $proxyStatus;
 		}
@@ -121,7 +122,7 @@ class Session {
 		if (\OCA\Encryption\Helper::isPublicAccess()) {
 			return $this->getPublicSharePrivateKey();
 		} else {
-			if (!is_null( \OC::$session->get('privateKey') )) {
+			if (!is_null(\OC::$session->get('privateKey'))) {
 				return \OC::$session->get('privateKey');
 			} else {
 				return false;
@@ -136,7 +137,7 @@ class Session {
 	 */
 	public function setPublicSharePrivateKey($privateKey) {
 
-			\OC::$session->set('publicSharePrivateKey', $privateKey);
+		\OC::$session->set('publicSharePrivateKey', $privateKey);
 
 		return true;
 
@@ -149,7 +150,7 @@ class Session {
 	 */
 	public function getPublicSharePrivateKey() {
 
-		if (!is_null( \OC::$session->get('publicSharePrivateKey') )) {
+		if (!is_null(\OC::$session->get('publicSharePrivateKey'))) {
 			return \OC::$session->get('publicSharePrivateKey');
 		} else {
 			return false;
@@ -176,7 +177,7 @@ class Session {
 	 */
 	public function getLegacyKey() {
 
-		if ( !is_null( \OC::$session->get('legacyKey') ) ) {
+		if (!is_null(\OC::$session->get('legacyKey'))) {
 
 			return \OC::$session->get('legacyKey');
 
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 072c5286644..3c1eb2c5f5e 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -56,18 +56,21 @@ class Stream {
 	private $relPath; // rel path to users file dir
 	private $userId;
 	private $handle; // Resource returned by fopen
-	private $path;
-	private $readBuffer; // For streams that dont support seeking
 	private $meta = array(); // Header / meta for source stream
-	private $count;
 	private $writeCache;
 	private $size;
 	private $unencryptedSize;
 	private $publicKey;
-	private $keyfile;
 	private $encKeyfile;
-	private static $view; // a fsview object set to user dir
+	/**
+	 * @var \OC\Files\View
+	 */
 	private $rootView; // a fsview object set to '/'
+	/**
+	 * @var \OCA\Encryption\Session
+	 */
+	private $session;
+	private $privateKey;
 
 	/**
 	 * @param $path
@@ -82,6 +85,10 @@ class Stream {
 			$this->rootView = new \OC_FilesystemView('/');
 		}
 
+		$this->session = new \OCA\Encryption\Session($this->rootView);
+
+		$this->privateKey = $this->session->getPrivateKey($this->userId);
+
 		$util = new Util($this->rootView, \OCP\USER::getUser());
 
 		$this->userId = $util->getUserId();
@@ -109,6 +116,11 @@ class Stream {
 
 		} else {
 
+			if($this->privateKey === false) {
+				// if private key is not valid redirect user to a error page
+				\OCA\Encryption\Helper::redirectToErrorPage();
+			}
+
 			$this->size = $this->rootView->filesize($this->rawPath, $mode);
 		}
 
@@ -118,7 +130,7 @@ class Stream {
 
 		if (!is_resource($this->handle)) {
 
-			\OCP\Util::writeLog('files_encryption', 'failed to open file "' . $this->rawPath . '"', \OCP\Util::ERROR);
+			\OCP\Util::writeLog('Encryption library', 'failed to open file "' . $this->rawPath . '"', \OCP\Util::ERROR);
 
 		} else {
 
@@ -156,7 +168,7 @@ class Stream {
 
 			// $count will always be 8192 https://bugs.php.net/bug.php?id=21641
 			// This makes this function a lot simpler, but will break this class if the above 'bug' gets 'fixed'
-			\OCP\Util::writeLog('files_encryption', 'PHP "bug" 21641 no longer holds, decryption system requires refactoring', \OCP\Util::FATAL);
+			\OCP\Util::writeLog('Encryption library', 'PHP "bug" 21641 no longer holds, decryption system requires refactoring', \OCP\Util::FATAL);
 
 			die();
 
@@ -165,7 +177,7 @@ class Stream {
 		// Get the data from the file handle
 		$data = fread($this->handle, 8192);
 
-		$result = '';
+		$result = null;
 
 		if (strlen($data)) {
 
@@ -175,10 +187,11 @@ class Stream {
 				throw new \Exception(
 					'Encryption key not found for "' . $this->rawPath . '" during attempted read via stream');
 
-			}
+			} else {
 
-			// Decrypt data
-			$result = Crypt::symmetricDecryptFileContent($data, $this->plainKey);
+				// Decrypt data
+				$result = Crypt::symmetricDecryptFileContent($data, $this->plainKey);
+			}
 
 		}
 
@@ -228,13 +241,18 @@ class Stream {
 		// If a keyfile already exists
 		if ($this->encKeyfile) {
 
-			$session = new \OCA\Encryption\Session( $this->rootView );
+			// if there is no valid private key return false
+			if ($this->privateKey === false) {
+
+				// if private key is not valid redirect user to a error page
+				\OCA\Encryption\Helper::redirectToErrorPage();
 
-			$privateKey = $session->getPrivateKey($this->userId);
+				return false;
+			}
 
 			$shareKey = Keymanager::getShareKey($this->rootView, $this->userId, $this->relPath);
 
-			$this->plainKey = Crypt::multiKeyDecrypt($this->encKeyfile, $shareKey, $privateKey);
+			$this->plainKey = Crypt::multiKeyDecrypt($this->encKeyfile, $shareKey, $this->privateKey);
 
 			return true;
 
@@ -257,6 +275,12 @@ class Stream {
 	 */
 	public function stream_write($data) {
 
+		// if there is no valid private key return false
+		if ($this->privateKey === false) {
+			$this->size = 0;
+			return strlen($data);
+		}
+
 		// Disable the file proxies so that encryption is not 
 		// automatically attempted when the file is written to disk - 
 		// we are handling that separately here and we don't want to 
@@ -424,6 +448,28 @@ class Stream {
 
 		$this->flush();
 
+		// if there is no valid private key return false
+		if ($this->privateKey === false) {
+
+				// cleanup
+				if ($this->meta['mode'] !== 'r' && $this->meta['mode'] !== 'rb') {
+
+					// Disable encryption proxy to prevent recursive calls
+					$proxyStatus = \OC_FileProxy::$enabled;
+					\OC_FileProxy::$enabled = false;
+
+					if ($this->rootView->file_exists($this->rawPath) && $this->size === 0) {
+						$this->rootView->unlink($this->rawPath);
+					}
+
+					// Re-enable proxy - our work is done
+					\OC_FileProxy::$enabled = $proxyStatus;
+				}
+
+			// if private key is not valid redirect user to a error page
+			\OCA\Encryption\Helper::redirectToErrorPage();
+		}
+
 		if (
 			$this->meta['mode'] !== 'r'
 			and $this->meta['mode'] !== 'rb'
@@ -450,16 +496,14 @@ class Stream {
 			// Encrypt enc key for all sharing users
 			$this->encKeyfiles = Crypt::multiKeyEncrypt($this->plainKey, $publicKeys);
 
-			$view = new \OC_FilesystemView('/');
-
 			// Save the new encrypted file key
 			Keymanager::setFileKey($this->rootView, $this->relPath, $this->userId, $this->encKeyfiles['data']);
 
 			// Save the sharekeys
-			Keymanager::setShareKeys($view, $this->relPath, $this->encKeyfiles['keys']);
+			Keymanager::setShareKeys($this->rootView, $this->relPath, $this->encKeyfiles['keys']);
 
 			// get file info
-			$fileInfo = $view->getFileInfo($this->rawPath);
+			$fileInfo = $this->rootView->getFileInfo($this->rawPath);
 			if (!is_array($fileInfo)) {
 				$fileInfo = array();
 			}
@@ -473,7 +517,7 @@ class Stream {
 			$fileInfo['unencrypted_size'] = $this->unencryptedSize;
 
 			// set fileinfo
-			$view->putFileInfo($this->rawPath, $fileInfo);
+			$this->rootView->putFileInfo($this->rawPath, $fileInfo);
 		}
 
 		return fclose($this->handle);
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 04bd4dc8aca..b4b3923a799 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -96,10 +96,13 @@ class Util {
 	//// DONE: test new encryption with sharing
 	//// TODO: test new encryption with proxies
 
+	const MIGRATION_COMPLETED = 1;    // migration to new encryption completed
+	const MIGRATION_IN_PROGRESS = -1; // migration is running
+	const MIGRATION_OPEN = 0;         // user still needs to be migrated
+
 
 	private $view; // OC_FilesystemView object for filesystem operations
 	private $userId; // ID of the currently logged-in user
-	private $pwd; // User Password
 	private $client; // Client side encryption mode flag
 	private $publicKeyDir; // Dir containing all public user keys
 	private $encryptionDir; // Dir containing user's files_encryption
@@ -289,7 +292,7 @@ class Util {
 	 */
 	public function recoveryEnabledForUser() {
 
-		$sql = 'SELECT `recovery_enabled` FROM `*PREFIX*encryption` WHERE  uid = ?';
+		$sql = 'SELECT `recovery_enabled` FROM `*PREFIX*encryption` WHERE `uid` = ?';
 
 		$args = array($this->userId);
 
@@ -302,7 +305,7 @@ class Util {
 		if (\OCP\DB::isError($result)) {
 			\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
 		} else {
-			if($result->numRows() > 0) {
+			if ($result->numRows() > 0) {
 				$row = $result->fetchRow();
 				if (isset($row['recovery_enabled'])) {
 					$recoveryEnabled[] = $row['recovery_enabled'];
@@ -347,7 +350,7 @@ class Util {
 			// Create a new record instead
 		} else {
 
-			$sql = 'UPDATE `*PREFIX*encryption` SET recovery_enabled = ? WHERE uid = ?';
+			$sql = 'UPDATE `*PREFIX*encryption` SET `recovery_enabled` = ? WHERE `uid` = ?';
 
 			$args = array(
 				$enabled,
@@ -421,8 +424,7 @@ class Util {
 						// where they got re-enabled :/
 						\OC_FileProxy::$enabled = false;
 
-						$data = $this->view->file_get_contents($filePath);
-
+						$isEncryptedPath = $this->isEncryptedPath($filePath);
 						// If the file is encrypted
 						// NOTE: If the userId is 
 						// empty or not set, file will 
@@ -432,7 +434,7 @@ class Util {
 						// will eat server resources :(
 						if (
 							Keymanager::getFileKey($this->view, $this->userId, $relPath)
-							&& Crypt::isCatfileContent($data)
+							&& $isEncryptedPath
 						) {
 
 							$found['encrypted'][] = array(
@@ -442,7 +444,7 @@ class Util {
 
 							// If the file uses old
 							// encryption system
-						} elseif ( Crypt::isLegacyEncryptedContent( $data, $relPath ) ) {
+						} elseif (Crypt::isLegacyEncryptedContent($isEncryptedPath, $relPath)) {
 
 							$found['legacy'][] = array(
 								'name' => $file,
@@ -573,7 +575,9 @@ class Util {
 		// get relative path
 		$relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
 
-		if (isset($pathParts[2]) && $pathParts[2] === 'files' && $this->view->file_exists($path) && $this->isEncryptedPath($path)) {
+		if (isset($pathParts[2]) && $pathParts[2] === 'files' && $this->view->file_exists($path)
+			&& $this->isEncryptedPath($path)
+		) {
 
 			// get the size from filesystem
 			$fullPath = $this->view->getLocalFile($path);
@@ -643,7 +647,7 @@ class Util {
 		return $result;
 	}
 
-	
+
 	/**
 	 * @param $path
 	 * @return bool
@@ -687,28 +691,32 @@ class Util {
 				$relPath = $plainFile['path'];
 
 				//relative to /data
-				$rawPath = '/'.$this->userId . '/files/' . $plainFile['path'];
+				$rawPath = '/' . $this->userId . '/files/' . $plainFile['path'];
 
 				// Open plain file handle for binary reading
-				$plainHandle = $this->view->fopen( $rawPath, 'rb' );
+				$plainHandle = $this->view->fopen($rawPath, 'rb');
 
 				// Open enc file handle for binary writing, with same filename as original plain file
-				$encHandle = fopen( 'crypt://' . $relPath.'.tmp', 'wb' );
+				$encHandle = fopen('crypt://' . $relPath . '.part', 'wb');
 
 				// Move plain file to a temporary location
-				$size = stream_copy_to_stream( $plainHandle, $encHandle );
+				$size = stream_copy_to_stream($plainHandle, $encHandle);
 
 				fclose($encHandle);
 
 				$fakeRoot = $this->view->getRoot();
-				$this->view->chroot('/'.$this->userId.'/files');
+				$this->view->chroot('/' . $this->userId . '/files');
 
-				$this->view->rename($relPath . '.tmp', $relPath);
+				$this->view->rename($relPath . '.part', $relPath);
 
 				$this->view->chroot($fakeRoot);
 
 				// Add the file to the cache
-				\OC\Files\Filesystem::putFileInfo( $relPath, array( 'encrypted' => true, 'size' => $size, 'unencrypted_size' => $size ) );
+				\OC\Files\Filesystem::putFileInfo($relPath, array(
+																 'encrypted' => true,
+																 'size' => $size,
+																 'unencrypted_size' => $size
+															));
 			}
 
 			// Encrypt legacy encrypted files
@@ -722,40 +730,28 @@ class Util {
 					// Fetch data from file
 					$legacyData = $this->view->file_get_contents($legacyFile['path']);
 
-					$sharingEnabled = \OCP\Share::isEnabled();
-
-					// if file exists try to get sharing users
-					if ($this->view->file_exists($legacyFile['path'])) {
-						$uniqueUserIds = $this->getSharingUsersArray($sharingEnabled, $legacyFile['path'], $this->userId);
-					} else {
-						$uniqueUserIds[] = $this->userId;
-					}
-
-					// Fetch public keys for all users who will share the file
-					$publicKeys = Keymanager::getPublicKeys($this->view, $uniqueUserIds);
-
-					// Recrypt data, generate catfile
-					$recrypted = Crypt::legacyKeyRecryptKeyfile( $legacyData, $legacyPassphrase, $publicKeys );
+					// decrypt data, generate catfile
+					$decrypted = Crypt::legacyBlockDecrypt($legacyData, $legacyPassphrase);
 
 					$rawPath = $legacyFile['path'];
-					$relPath = \OCA\Encryption\Helper::stripUserFilesPath($rawPath);
 
-					// Save keyfile
-					Keymanager::setFileKey($this->view, $relPath, $this->userId, $recrypted['filekey']);
+					// enable proxy the ensure encryption is handled
+					\OC_FileProxy::$enabled = true;
 
-					// Save sharekeys to user folders
-					Keymanager::setShareKeys($this->view, $relPath, $recrypted['sharekeys']);
+					// Open enc file handle for binary writing, with same filename as original plain file
+					$encHandle = $this->view->fopen( $rawPath, 'wb' );
 
-					// Overwrite the existing file with the encrypted one
-					$this->view->file_put_contents($rawPath, $recrypted['data']);
+					if (is_resource($encHandle)) {
 
-					$size = strlen($recrypted['data']);
+						// write data to stream
+						fwrite($encHandle, $decrypted);
 
-					// Add the file to the cache
-					\OC\Files\Filesystem::putFileInfo($rawPath, array(
-																	 'encrypted' => true,
-																	 'size' => $size
-																), '');
+						// close stream
+						fclose($encHandle);
+					}
+
+					// disable proxy to prevent file being encrypted twice
+					\OC_FileProxy::$enabled = false;
 				}
 			}
 
@@ -831,7 +827,7 @@ class Util {
 		if (\OCP\DB::isError($result)) {
 			\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
 		} else {
-			if($result->numRows() > 0) {
+			if ($result->numRows() > 0) {
 				$row = $result->fetchRow();
 				$path = substr($row['path'], strlen('files'));
 			}
@@ -1054,42 +1050,62 @@ class Util {
 	}
 
 	/**
-	 * @brief Set file migration status for user
-	 * @param $status
-	 * @return bool
+	 * @brief start migration mode to initially encrypt users data
+	 * @return boolean
 	 */
-	public function setMigrationStatus($status) {
-
-		$sql = 'UPDATE `*PREFIX*encryption` SET migration_status = ? WHERE uid = ?';
+	public function beginMigration() {
 
-		$args = array(
-			$status,
-			$this->userId
-		);
+		$return = false;
 
+		$sql = 'UPDATE `*PREFIX*encryption` SET `migration_status` = ? WHERE `uid` = ? and `migration_status` = ?';
+		$args = array(self::MIGRATION_IN_PROGRESS, $this->userId, self::MIGRATION_OPEN);
 		$query = \OCP\DB::prepare($sql);
+		$result = $query->execute($args);
+		$manipulatedRows = $result->numRows();
 
-		if ($query->execute($args)) {
+		if ($manipulatedRows === 1) {
+			$return = true;
+			\OCP\Util::writeLog('Encryption library', "Start migration to encryption mode for " . $this->userId, \OCP\Util::INFO);
+		} else {
+			\OCP\Util::writeLog('Encryption library', "Could not activate migration mode for " . $this->userId . ". Probably another process already started the initial encryption", \OCP\Util::WARN);
+		}
 
-			return true;
+		return $return;
+	}
 
-		} else {
+	/**
+	 * @brief close migration mode after users data has been encrypted successfully
+	 * @return boolean
+	 */
+	public function finishMigration() {
 
-			return false;
+		$return = false;
 
+		$sql = 'UPDATE `*PREFIX*encryption` SET `migration_status` = ? WHERE `uid` = ? and `migration_status` = ?';
+		$args = array(self::MIGRATION_COMPLETED, $this->userId, self::MIGRATION_IN_PROGRESS);
+		$query = \OCP\DB::prepare($sql);
+		$result = $query->execute($args);
+		$manipulatedRows = $result->numRows();
+
+		if ($manipulatedRows === 1) {
+			$return = true;
+			\OCP\Util::writeLog('Encryption library', "Finish migration successfully for " . $this->userId, \OCP\Util::INFO);
+		} else {
+			\OCP\Util::writeLog('Encryption library', "Could not deactivate migration mode for " . $this->userId, \OCP\Util::WARN);
 		}
 
+		return $return;
 	}
 
 	/**
-	 * @brief Check whether pwd recovery is enabled for a given user
-	 * @return bool 1 = yes, 0 = no, false = no record
+	 * @brief check if files are already migrated to the encryption system
+	 * @return migration status, false = in case of no record
 	 * @note If records are not being returned, check for a hidden space
 	 *       at the start of the uid in db
 	 */
 	public function getMigrationStatus() {
 
-		$sql = 'SELECT `migration_status` FROM `*PREFIX*encryption`  WHERE uid = ?';
+		$sql = 'SELECT `migration_status` FROM `*PREFIX*encryption` WHERE `uid` = ?';
 
 		$args = array($this->userId);
 
@@ -1102,7 +1118,7 @@ class Util {
 		if (\OCP\DB::isError($result)) {
 			\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
 		} else {
-			if($result->numRows() > 0) {
+			if ($result->numRows() > 0) {
 				$row = $result->fetchRow();
 				if (isset($row['migration_status'])) {
 					$migrationStatus[] = $row['migration_status'];
@@ -1112,14 +1128,11 @@ class Util {
 
 		// If no record is found
 		if (empty($migrationStatus)) {
-
+			\OCP\Util::writeLog('Encryption library', "Could not get migration status for " . $this->userId . ", no record found", \OCP\Util::ERROR);
 			return false;
-
 			// If a record is found
 		} else {
-
-			return $migrationStatus[0];
-
+			return (int)$migrationStatus[0];
 		}
 
 	}
@@ -1191,7 +1204,8 @@ class Util {
 
 		$result = array();
 
-		$content = $this->view->getDirectoryContent(\OC\Files\Filesystem::normalizePath($this->userFilesDir . '/' . $dir));
+		$content = $this->view->getDirectoryContent(\OC\Files\Filesystem::normalizePath(
+			$this->userFilesDir . '/' . $dir));
 
 		// handling for re shared folders
 		$pathSplit = explode('/', $dir);
@@ -1252,7 +1266,7 @@ class Util {
 		if (\OCP\DB::isError($result)) {
 			\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
 		} else {
-			if($result->numRows() > 0) {
+			if ($result->numRows() > 0) {
 				$row = $result->fetchRow();
 			}
 		}
@@ -1278,7 +1292,7 @@ class Util {
 		if (\OCP\DB::isError($result)) {
 			\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
 		} else {
-			if($result->numRows() > 0) {
+			if ($result->numRows() > 0) {
 				$row = $result->fetchRow();
 			}
 		}
@@ -1303,7 +1317,7 @@ class Util {
 		if (\OCP\DB::isError($result)) {
 			\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
 		} else {
-			if($result->numRows() > 0) {
+			if ($result->numRows() > 0) {
 				$source = $result->fetchRow();
 			}
 		}
@@ -1324,7 +1338,7 @@ class Util {
 				if (\OCP\DB::isError($result)) {
 					\OCP\Util::writeLog('Encryption library', \OC_DB::getErrorMessage($result), \OCP\Util::ERROR);
 				} else {
-					if($result->numRows() > 0) {
+					if ($result->numRows() > 0) {
 						$item = $result->fetchRow();
 					}
 				}
@@ -1372,26 +1386,24 @@ class Util {
 	 */
 	public function checkRecoveryPassword($password) {
 
+		$result = false;
 		$pathKey = '/owncloud_private_key/' . $this->recoveryKeyId . ".private.key";
-		$pathControlData = '/control-file/controlfile.enc';
 
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 
 		$recoveryKey = $this->view->file_get_contents($pathKey);
 
-		$decryptedRecoveryKey = Crypt::symmetricDecryptFileContent($recoveryKey, $password);
+		$decryptedRecoveryKey = Crypt::decryptPrivateKey($recoveryKey, $password);
 
-		$controlData = $this->view->file_get_contents($pathControlData);
-		$decryptedControlData = Crypt::keyDecrypt($controlData, $decryptedRecoveryKey);
+		if ($decryptedRecoveryKey) {
+			$result = true;
+		}
 
 		\OC_FileProxy::$enabled = $proxyStatus;
 
-		if ($decryptedControlData === 'ownCloud') {
-			return true;
-		}
 
-		return false;
+		return $result;
 	}
 
 	/**
@@ -1520,7 +1532,7 @@ class Util {
 
 		$encryptedKey = $this->view->file_get_contents(
 			'/owncloud_private_key/' . $this->recoveryKeyId . '.private.key');
-		$privateKey = Crypt::symmetricDecryptFileContent($encryptedKey, $recoveryPassword);
+		$privateKey = Crypt::decryptPrivateKey($encryptedKey, $recoveryPassword);
 
 		\OC_FileProxy::$enabled = $proxyStatus;
 
@@ -1536,7 +1548,7 @@ class Util {
 		list($storage, $internalPath) = \OC\Files\Cache\Cache::getById($id);
 		$mount = \OC\Files\Filesystem::getMountByStorageId($storage);
 		$mountPoint = $mount[0]->getMountPoint();
-		$path = \OC\Files\Filesystem::normalizePath($mountPoint.'/'.$internalPath);
+		$path = \OC\Files\Filesystem::normalizePath($mountPoint . '/' . $internalPath);
 
 		// reformat the path to be relative e.g. /user/files/folder becomes /folder/
 		$relativePath = \OCA\Encryption\Helper::stripUserFilesPath($path);
diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php
index 3e96565949b..fddc3ea5eee 100644
--- a/apps/files_encryption/settings-personal.php
+++ b/apps/files_encryption/settings-personal.php
@@ -14,15 +14,26 @@ $tmpl = new OCP\Template('files_encryption', 'settings-personal');
 $user = \OCP\USER::getUser();

 $view = new \OC_FilesystemView('/');

 $util = new \OCA\Encryption\Util($view, $user);

+$session = new \OCA\Encryption\Session($view);

+

+$privateKeySet = ($session->getPrivateKey() !== false) ? true : false;

 

 $recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');

 $recoveryEnabledForUser = $util->recoveryEnabledForUser();

 

-\OCP\Util::addscript('files_encryption', 'settings-personal');

-\OCP\Util::addScript('settings', 'personal');

+$result = false;

+

+if ($recoveryAdminEnabled || !$privateKeySet) {

+

+	\OCP\Util::addscript('files_encryption', 'settings-personal');

+	\OCP\Util::addScript('settings', 'personal');

+

+	$tmpl->assign('recoveryEnabled', $recoveryAdminEnabled);

+	$tmpl->assign('recoveryEnabledForUser', $recoveryEnabledForUser);

+	$tmpl->assign('privateKeySet', $privateKeySet);

 

-$tmpl->assign('recoveryEnabled', $recoveryAdminEnabled);

-$tmpl->assign('recoveryEnabledForUser', $recoveryEnabledForUser);

+	$result = $tmpl->fetchPage();

+}

 

-return $tmpl->fetchPage();

+return $result;

 

diff --git a/apps/files_encryption/templates/invalid_private_key.php b/apps/files_encryption/templates/invalid_private_key.php
new file mode 100644
index 00000000000..5c086d6514c
--- /dev/null
+++ b/apps/files_encryption/templates/invalid_private_key.php
@@ -0,0 +1,10 @@
+<ul>
+	<li class='error'>
+		<?php $location = \OC_Helper::linkToRoute( "settings_personal" ).'#changePKPasswd' ?>
+
+		<?php p($l->t('Your private key is not valid! Maybe the your password was changed from outside.')); ?>
+		<br/>
+		<?php p($l->t('You can unlock your private key in your ')); ?> <a href="<?php echo $location?>"><?php p($l->t('personal settings')); ?>.</a>
+		<br/>
+	</li>
+</ul>
diff --git a/apps/files_encryption/templates/settings-admin.php b/apps/files_encryption/templates/settings-admin.php
index 18fea1845f4..c420b006c45 100644
--- a/apps/files_encryption/templates/settings-admin.php
+++ b/apps/files_encryption/templates/settings-admin.php
@@ -1,54 +1,56 @@
 <form id="encryption">
 	<fieldset class="personalblock">
-		
+
 		<p>
-			<strong><?php p($l->t( 'Encryption' )); ?></strong>
-			<br />
+			<strong><?php p($l->t('Encryption')); ?></strong>
+			<br/>
 		</p>
+
 		<p>
-			<?php p($l->t( "Enable encryption passwords recovery key (allow sharing to recovery key):" )); ?>
-			<br />
-			<br />
-			<input type="password" name="recoveryPassword" id="recoveryPassword" />
-			<label for="recoveryPassword"><?php p($l->t( "Recovery account password" )); ?></label>
-			<br />
-			<input 
-			type='radio'
-			name='adminEnableRecovery'
-			value='1'
-			<?php echo ( $_["recoveryEnabled"] == 1 ? 'checked="checked"' : 'disabled' ); ?> />
-			<?php p($l->t( "Enabled" )); ?>
-			<br />
-			
-			<input 
-			type='radio'
-			name='adminEnableRecovery'
-			value='0'
-			<?php echo ( $_["recoveryEnabled"] == 0 ? 'checked="checked"' : 'disabled' ); ?> />
-			<?php p($l->t( "Disabled" )); ?>
+			<?php p($l->t("Enable encryption passwords recovery key (allow sharing to recovery key):")); ?>
+			<br/>
+			<br/>
+			<input type="password" name="recoveryPassword" id="recoveryPassword"/>
+			<label for="recoveryPassword"><?php p($l->t("Recovery account password")); ?></label>
+			<br/>
+			<input
+				type='radio'
+				name='adminEnableRecovery'
+				value='1'
+				<?php echo($_["recoveryEnabled"] == 1 ? 'checked="checked"' : 'disabled'); ?> />
+			<?php p($l->t("Enabled")); ?>
+			<br/>
+
+			<input
+				type='radio'
+				name='adminEnableRecovery'
+				value='0'
+				<?php echo($_["recoveryEnabled"] == 0 ? 'checked="checked"' : 'disabled'); ?> />
+			<?php p($l->t("Disabled")); ?>
 		</p>
-		<br /><br />
+		<br/><br/>
+
 		<p>
-			<strong><?php p($l->t( "Change encryption passwords recovery key:" )); ?></strong>
-			<br /><br />
-			<input 
+			<strong><?php p($l->t("Change encryption passwords recovery key:")); ?></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>
-			<br />
-			<input 
+				<?php echo($_["recoveryEnabled"] == 0 ? 'disabled' : ''); ?> />
+			<label for="oldRecoveryPassword"><?php p($l->t("Old Recovery account 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>
-			<br />
+				<?php echo($_["recoveryEnabled"] == 0 ? 'disabled' : ''); ?> />
+			<label for="newRecoveryPassword"><?php p($l->t("New Recovery account password")); ?></label>
+			<br/>
 			<button
 				type="button"
 				name="submitChangeRecoveryKey"
-				disabled><?php p($l->t( "Change Password" )); ?>
+				disabled><?php p($l->t("Change Password")); ?>
 			</button>
 			<span class="msg"></span>
 		</p>
diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
index 04d6e79179e..38512453207 100644
--- a/apps/files_encryption/templates/settings-personal.php
+++ b/apps/files_encryption/templates/settings-personal.php
@@ -3,12 +3,48 @@
 		<legend>

 			<?php p( $l->t( 'Encryption' ) ); ?>

 		</legend>

+

+		<?php if ( ! $_["privateKeySet"] ): ?>

+			<p>

+				<a name="changePKPasswd" />

+				<label for="changePrivateKeyPasswd">

+					<?php p( $l->t( "Your private key password no longer match your log-in password:" ) ); ?>

+				</label>

+				<br />

+				<em><?php p( $l->t( "Set your old private key password to your current log-in password." ) ); ?>

+				<?php if (  $_["recoveryEnabledForUser"] ):

+						p( $l->t( " If you don't remember your old password you can ask your administrator to recover your files." ) );

+				endif; ?>

+				</em>

+				<br />

+				<input

+					type="password"

+					name="changePrivateKeyPassword"

+					id="oldPrivateKeyPassword" />

+				<label for="oldPrivateKeyPassword"><?php p($l->t( "Old log-in password" )); ?></label>

+				<br />

+				<input

+					type="password"

+					name="changePrivateKeyPassword"

+					id="newPrivateKeyPassword" />

+				<label for="newRecoveryPassword"><?php p($l->t( "Current log-in password" )); ?></label>

+				<br />

+				<button

+					type="button"

+					name="submitChangePrivateKeyPassword"

+					disabled><?php p($l->t( "Update Private Key Password" )); ?>

+				</button>

+				<span class="msg"></span>

+			</p>

+		<?php endif; ?>

+

+		<br />

 		

-		<?php if ( $_["recoveryEnabled"] ): ?>

+		<?php if ( $_["recoveryEnabled"] && $_["privateKeySet"] ): ?>

 			<p>

-				<label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery by sharing all files with your administrator:" ) ); ?></label>

+				<label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery:" ) ); ?></label>

 				<br />

-				<em><?php p( $l->t( "Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" ) ); ?></em>

+				<em><?php p( $l->t( "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" ) ); ?></em>

 				<br />

 				<input 

 				type='radio'

@@ -28,6 +64,7 @@
 				<div id="recoveryEnabledError"><?php p( $l->t( 'Could not update file recovery' ) ); ?></div>

 			</p>

 		<?php endif; ?>

+

 		<br />

 	</fieldset>

 </form>

diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 32156eea272..9b97df22d16 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -92,8 +92,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 		// reset app files_trashbin
 		if ($this->stateFilesTrashbin) {
 			OC_App::enable('files_trashbin');
-		}
-		else {
+		} else {
 			OC_App::disable('files_trashbin');
 		}
 	}
@@ -103,6 +102,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 		\OC_User::deleteUser(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1);
 	}
 
+	/**
+	 * @medium
+	 */
 	function testGenerateKey() {
 
 		# TODO: use more accurate (larger) string length for test confirmation
@@ -114,6 +116,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
+	 * @large
 	 * @return String
 	 */
 	function testGenerateIv() {
@@ -127,6 +130,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
+	 * @large
 	 * @depends testGenerateIv
 	 */
 	function testConcatIv($iv) {
@@ -159,6 +163,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
+	 * @medium
 	 * @depends testConcatIv
 	 */
 	function testSplitIv($testConcatIv) {
@@ -175,6 +180,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
+	 * @medium
 	 * @return string padded
 	 */
 	function testAddPadding() {
@@ -190,6 +196,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
+	 * @medium
 	 * @depends testAddPadding
 	 */
 	function testRemovePadding($padded) {
@@ -200,6 +207,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 
 	}
 
+	/**
+	 * @medium
+	 */
 	function testEncrypt() {
 
 		$random = openssl_random_pseudo_bytes(13);
@@ -212,6 +222,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 
 	}
 
+	/**
+	 * @medium
+	 */
 	function testDecrypt() {
 
 		$random = openssl_random_pseudo_bytes(13);
@@ -226,6 +239,26 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 
 	}
 
+	function testDecryptPrivateKey() {
+
+		// test successful decrypt
+		$crypted = Encryption\Crypt::symmetricEncryptFileContent($this->genPrivateKey, 'hat');
+
+		$decrypted = Encryption\Crypt::decryptPrivateKey($crypted, 'hat');
+
+		$this->assertEquals($this->genPrivateKey, $decrypted);
+
+		//test private key decrypt with wrong password
+		$wrongPasswd = Encryption\Crypt::decryptPrivateKey($crypted, 'hat2');
+
+		$this->assertEquals(false, $wrongPasswd);
+
+	}
+
+
+	/**
+	 * @medium
+	 */
 	function testSymmetricEncryptFileContent() {
 
 		# TODO: search in keyfile for actual content as IV will ensure this test always passes
@@ -241,6 +274,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 
 	}
 
+	/**
+	 * @medium
+	 */
 	function testSymmetricStreamEncryptShortFileContent() {
 
 		$filename = 'tmp-' . time() . '.test';
@@ -291,6 +327,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
+	 * @medium
 	 * @brief Test that data that is written by the crypto stream wrapper
 	 * @note Encrypted data is manually prepared and decrypted here to avoid dependency on success of stream_read
 	 * @note If this test fails with truncate content, check that enough array slices are being rejoined to form $e, as the crypt.php file may have gotten longer and broken the manual
@@ -377,6 +414,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
+	 * @medium
 	 * @brief Test that data that is read by the crypto stream wrapper
 	 */
 	function testSymmetricStreamDecryptShortFileContent() {
@@ -406,6 +444,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 		$this->view->unlink($this->userId . '/files/' . $filename);
 	}
 
+	/**
+	 * @medium
+	 */
 	function testSymmetricStreamDecryptLongFileContent() {
 
 		$filename = 'tmp-' . time();
@@ -425,6 +466,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 		$this->view->unlink($this->userId . '/files/' . $filename);
 	}
 
+	/**
+	 * @medium
+	 */
 	function testSymmetricEncryptFileContentKeyfile() {
 
 		# TODO: search in keyfile for actual content as IV will ensure this test always passes
@@ -440,6 +484,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 
 	}
 
+	/**
+	 * @medium
+	 */
 	function testIsEncryptedContent() {
 
 		$this->assertFalse(Encryption\Crypt::isCatfileContent($this->dataUrl));
@@ -452,6 +499,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 
 	}
 
+	/**
+	 * @large
+	 */
 	function testMultiKeyEncrypt() {
 
 		# TODO: search in keyfile for actual content as IV will ensure this test always passes
@@ -476,6 +526,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 
 	}
 
+	/**
+	 * @medium
+	 */
 	function testKeyEncrypt() {
 
 		// Generate keypair
@@ -494,6 +547,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
+	 * @medium
 	 * @brief test encryption using legacy blowfish method
 	 */
 	function testLegacyEncryptShort() {
@@ -510,6 +564,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
+	 * @medium
 	 * @brief test decryption using legacy blowfish method
 	 * @depends testLegacyEncryptShort
 	 */
@@ -522,6 +577,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
+	 * @medium
 	 * @brief test encryption using legacy blowfish method
 	 */
 	function testLegacyEncryptLong() {
@@ -538,6 +594,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
+	 * @medium
 	 * @brief test decryption using legacy blowfish method
 	 * @depends testLegacyEncryptLong
 	 */
@@ -551,6 +608,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
+	 * @medium
 	 * @brief test generation of legacy encryption key
 	 * @depends testLegacyDecryptShort
 	 */
@@ -570,22 +628,8 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
-	 * @brief test decryption using legacy blowfish method
-	 * @depends testLegacyEncryptLong
+	 * @medium
 	 */
-	function testLegacyKeyRecryptKeyfileEncrypt($crypted) {
-
-		$recrypted = Encryption\Crypt::LegacyKeyRecryptKeyfile($crypted, $this->pass, array($this->genPublicKey));
-
-		$this->assertNotEquals($this->dataLong, $recrypted['data']);
-
-		return $recrypted;
-
-		# TODO: search inencrypted text for actual content to ensure it
-		# genuine transformation
-
-	}
-
 	function testRenameFile() {
 
 		$filename = 'tmp-' . time();
@@ -614,6 +658,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 		$view->unlink($newFilename);
 	}
 
+	/**
+	 * @medium
+	 */
 	function testMoveFileIntoFolder() {
 
 		$filename = 'tmp-' . time();
@@ -644,6 +691,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 		$view->unlink($newFolder);
 	}
 
+	/**
+	 * @medium
+	 */
 	function testMoveFolder() {
 
 		$view = new \OC\Files\View('/' . $this->userId . '/files');
@@ -679,6 +729,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 		$view->unlink('/newfolder');
 	}
 
+	/**
+	 * @medium
+	 */
 	function testChangePassphrase() {
 		$filename = 'tmp-' . time();
 
@@ -713,6 +766,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 		$view->unlink($filename);
 	}
 
+	/**
+	 * @medium
+	 */
 	function testViewFilePutAndGetContents() {
 
 		$filename = '/tmp-' . time();
@@ -744,6 +800,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 		$view->unlink($filename);
 	}
 
+	/**
+	 * @large
+	 */
 	function testTouchExistingFile() {
 		$filename = '/tmp-' . time();
 		$view = new \OC\Files\View('/' . $this->userId . '/files');
@@ -765,6 +824,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 		$view->unlink($filename);
 	}
 
+	/**
+	 * @medium
+	 */
 	function testTouchFile() {
 		$filename = '/tmp-' . time();
 		$view = new \OC\Files\View('/' . $this->userId . '/files');
@@ -786,6 +848,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 		$view->unlink($filename);
 	}
 
+	/**
+	 * @medium
+	 */
 	function testFopenFile() {
 		$filename = '/tmp-' . time();
 		$view = new \OC\Files\View('/' . $this->userId . '/files');
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index 40ae1659a55..19ba9a8117f 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -103,6 +103,9 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
 		\OC_FileProxy::$enabled = true;
 	}
 
+	/**
+	 * @medium
+	 */
 	function testGetPrivateKey() {
 
 		$key = Encryption\Keymanager::getPrivateKey($this->view, $this->userId);
@@ -119,6 +122,9 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
 
 	}
 
+	/**
+	 * @medium
+	 */
 	function testGetPublicKey() {
 
 		$publiceKey = Encryption\Keymanager::getPublicKey($this->view, $this->userId);
@@ -132,6 +138,9 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
 		$this->assertArrayHasKey('key', $sslInfo);
 	}
 
+	/**
+	 * @medium
+	 */
 	function testSetFileKey() {
 
 		# NOTE: This cannot be tested until we are able to break out 
@@ -165,6 +174,9 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
 
 	}
 
+	/**
+	 * @medium
+	 */
 	function testGetUserKeys() {
 
 		$keys = Encryption\Keymanager::getUserKeys($this->view, $this->userId);
@@ -188,6 +200,9 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
 		$this->assertArrayHasKey('key', $sslInfoPrivate);
 	}
 
+	/**
+	 * @medium
+	 */
 	function testFixPartialFilePath() {
 
 		$partFilename = 'testfile.txt.part';
@@ -202,6 +217,9 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals('testfile.txt', Encryption\Keymanager::fixPartialFilePath($filename));
 	}
 
+	/**
+	 * @medium
+	 */
 	function testRecursiveDelShareKeys() {
 
 		// generate filename
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 816bc709f26..6b530315859 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -111,8 +111,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		// reset app files_trashbin
 		if ($this->stateFilesTrashbin) {
 			OC_App::enable('files_trashbin');
-		}
-		else {
+		} else {
 			OC_App::disable('files_trashbin');
 		}
 	}
@@ -129,6 +128,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
+	 * @medium
 	 * @param bool $withTeardown
 	 */
 	function testShareFile($withTeardown = true) {
@@ -205,6 +205,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
+	 * @medium
 	 * @param bool $withTeardown
 	 */
 	function testReShareFile($withTeardown = true) {
@@ -275,6 +276,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
+	 * @medium
 	 * @param bool $withTeardown
 	 * @return array
 	 */
@@ -363,6 +365,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
+	 * @medium
 	 * @param bool $withTeardown
 	 */
 	function testReShareFolder($withTeardown = true) {
@@ -564,6 +567,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
 	}
 
+	/**
+	 * @medium
+	 */
 	function testShareFileWithGroup() {
 		// login as admin
 		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
@@ -639,6 +645,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 
 	}
 
+	/**
+	 * @large
+	 */
 	function testRecoveryFile() {
 		// login as admin
 		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
@@ -646,9 +655,6 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		\OCA\Encryption\Helper::adminEnableRecovery(null, 'test123');
 		$recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
 
-		// check if control file created
-		$this->assertTrue($this->view->file_exists('/control-file/controlfile.enc'));
-
 		// login as admin
 		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
@@ -741,6 +747,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals(0, \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled'));
 	}
 
+	/**
+	 * @large
+	 */
 	function testRecoveryForUser() {
 		// login as admin
 		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
@@ -748,9 +757,6 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		\OCA\Encryption\Helper::adminEnableRecovery(null, 'test123');
 		$recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId');
 
-		// check if control file created
-		$this->assertTrue($this->view->file_exists('/control-file/controlfile.enc'));
-
 		// login as user1
 		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 
@@ -837,6 +843,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals(0, \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled'));
 	}
 
+	/**
+	 * @medium
+	 */
 	function testFailShareFile() {
 		// login as admin
 		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index 3d978767542..50ac41e4536 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -140,6 +140,9 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
 		$view->unlink($filename);
 	}
 
+	/**
+	 * @medium
+	 */
 	function testStreamSetTimeout() {
 		$filename = '/tmp-' . time();
 		$view = new \OC\Files\View('/' . $this->userId . '/files');
diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php
index 29f8fb5a396..ade968fbece 100755
--- a/apps/files_encryption/tests/trashbin.php
+++ b/apps/files_encryption/tests/trashbin.php
@@ -113,6 +113,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
+	 * @medium
 	 * @brief test delete file
 	 */
 	function testDeleteFile() {
@@ -184,6 +185,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
+	 * @medium
 	 * @brief test restore file
 	 *
 	 * @depends testDeleteFile
@@ -215,6 +217,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
+	 * @medium
 	 * @brief test delete file forever
 	 */
 	function testPermanentDeleteFile() {
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index 0dc452a41c8..cb10befc8e4 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -75,7 +75,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 		$this->legacyData = realpath(dirname(__FILE__) . '/legacy-text.txt');
 		$this->legacyEncryptedData = realpath(dirname(__FILE__) . '/legacy-encrypted-text.txt');
 		$this->legacyEncryptedDataKey = realpath(dirname(__FILE__) . '/encryption.key');
-		$this->legacyKey = '30943623843030686906';
+		$this->legacyKey = "30943623843030686906\0\0\0\0";
 
 		$keypair = Encryption\Crypt::createKeypair();
 
@@ -118,6 +118,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
+	 * @medium
 	 * @brief test that paths set during User construction are correct
 	 */
 	function testKeyPaths() {
@@ -132,6 +133,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
+	 * @medium
 	 * @brief test setup of encryption directories
 	 */
 	function testSetupServerSide() {
@@ -139,6 +141,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 	}
 
 	/**
+	 * @medium
 	 * @brief test checking whether account is ready for encryption,
 	 */
 	function testUserIsReady() {
@@ -159,6 +162,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 //	}
 
 	/**
+	 * @medium
 	 * @brief test checking whether account is not ready for encryption,
 	 */
 	function testIsLegacyUser() {
@@ -178,14 +182,16 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 		$params['uid'] = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER;
 		$params['password'] = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER;
 
-		$util = new Encryption\Util($this->view, \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
-		$util->setMigrationStatus(0);
+		$this->setMigrationStatus(0, \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
 
 		$this->assertTrue(OCA\Encryption\Hooks::login($params));
 
 		$this->assertEquals($this->legacyKey, \OC::$session->get('legacyKey'));
 	}
 
+	/**
+	 * @medium
+	 */
 	function testRecoveryEnabledForUser() {
 
 		$util = new Encryption\Util($this->view, $this->userId);
@@ -206,6 +212,9 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 
 	}
 
+	/**
+	 * @medium
+	 */
 	function testGetUidAndFilename() {
 
 		\OC_User::setUserId(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
@@ -232,6 +241,9 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 		$this->view->unlink($this->userId . '/files/' . $filename);
 	}
 
+	/**
+	 * @medium
+	 */
 	function testIsSharedPath() {
 		$sharedPath = '/user1/files/Shared/test';
 		$path = '/user1/files/test';
@@ -241,6 +253,9 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 		$this->assertFalse($this->util->isSharedPath($path));
 	}
 
+	/**
+	 * @large
+	 */
 	function testEncryptLegacyFiles() {
 		\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
 
@@ -269,7 +284,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 		$params['password'] = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER;
 
 		$util = new Encryption\Util($this->view, \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
-		$util->setMigrationStatus(0);
+		$this->setMigrationStatus(0, \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
 
 		$this->assertTrue(OCA\Encryption\Hooks::login($params));
 
@@ -314,4 +329,28 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 		$params['password'] = $password;
 		OCA\Encryption\Hooks::login($params);
 	}
+
+	/**
+	 * helper function to set migration status to the right value
+	 * to be able to test the migration path
+	 * 
+	 * @param $status needed migration status for test
+	 * @param $user for which user the status should be set
+	 * @return boolean
+	 */
+	private function setMigrationStatus($status, $user) {
+		$sql = 'UPDATE `*PREFIX*encryption` SET `migration_status` = ? WHERE `uid` = ?';
+		$args = array(
+			$status,
+			$user
+		);
+
+		$query = \OCP\DB::prepare($sql);
+		if ($query->execute($args)) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
 }
diff --git a/apps/files_external/ajax/addRootCertificate.php b/apps/files_external/ajax/addRootCertificate.php
index 43fd6752c4a..ae349bfcd3a 100644
--- a/apps/files_external/ajax/addRootCertificate.php
+++ b/apps/files_external/ajax/addRootCertificate.php
@@ -29,8 +29,12 @@ if ($isValid == false) {
 
 // add the certificate if it could be verified
 if ( $isValid ) {
+	// disable proxy to prevent multiple fopen calls
+	$proxyStatus = \OC_FileProxy::$enabled;
+	\OC_FileProxy::$enabled = false;
 	$view->file_put_contents($filename, $data);
 	OC_Mount_Config::createCertificateBundle();
+	\OC_FileProxy::$enabled = $proxyStatus;
 } else {
 	OCP\Util::writeLog('files_external',
 			'Couldn\'t import SSL root certificate ('.$filename.'), allowed formats: PEM and DER',
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index ac408786ff6..3e605c59a93 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -88,7 +88,7 @@ OC.MountConfig={
 						url: OC.filePath('files_external', 'ajax', 'removeMountPoint.php'),
 						data: {
 							mountPoint: mountPoint,
-							class: backendClass,
+							'class': backendClass,
 							classOptions: classOptions,
 							mountType: mountType,
 							applicable: applicable,
@@ -103,7 +103,7 @@ OC.MountConfig={
 						url: OC.filePath('files_external', 'ajax', 'removeMountPoint.php'),
 						data: {
 							mountPoint: mountPoint,
-							class: backendClass,
+							'class': backendClass,
 							classOptions: classOptions,
 							mountType: mountType,
 							applicable: applicable,
@@ -247,15 +247,18 @@ $(document).ready(function() {
 		OC.MountConfig.saveStorage($(this).parent().parent());
 	});
 
+    $('#sslCertificate').on('click', 'td.remove>img', function() {
+		var $tr = $(this).parent().parent();
+		var row = this.parentNode.parentNode;
+		$.post(OC.filePath('files_external', 'ajax', 'removeRootCertificate.php'), {cert: row.id});
+		$tr.remove();
+		return true;
+	});
+
 	$('#externalStorage').on('click', 'td.remove>img', function() {
 		var tr = $(this).parent().parent();
 		var mountPoint = $(tr).find('.mountPoint input').val();
-		if ( ! mountPoint) {
-			var row=this.parentNode.parentNode;
-			$.post(OC.filePath('files_external', 'ajax', 'removeRootCertificate.php'), { cert: row.id  });
-			$(tr).remove();
-			return true;
-		}
+
 		if ($('#externalStorage').data('admin') === true) {
 			var isPersonal = false;
 			var multiselect = $(tr).find('.chzn-select').val();
diff --git a/apps/files_external/l10n/es_AR.php b/apps/files_external/l10n/es_AR.php
index 6706aa43a31..a8446152725 100644
--- a/apps/files_external/l10n/es_AR.php
+++ b/apps/files_external/l10n/es_AR.php
@@ -6,6 +6,7 @@
 "Error configuring Google Drive storage" => "Error al configurar el almacenamiento de Google Drive",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Advertencia:</b> El cliente smb (smbclient) no se encuentra instalado. El montado de archivos o ficheros CIFS/SMB no es posible. Por favor pida al administrador de su sistema que lo instale.",
 "<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>Advertencia:</b> El soporte de FTP en PHP no se encuentra instalado. El montado de archivos o ficheros FTP no es posible. Por favor pida al administrador de su sistema que lo instale.",
+"<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>Advertencia:</b> El soporte de Curl de PHP no está activado ni instalado. Montar servicios ownCloud, WebDAV y/o GoogleDrive no será posible. Pedile al administrador del sistema que lo instale.",
 "External Storage" => "Almacenamiento externo",
 "Folder name" => "Nombre de la carpeta",
 "External storage" => "Almacenamiento externo",
diff --git a/apps/files_sharing/l10n/af_ZA.php b/apps/files_sharing/l10n/af_ZA.php
index 344585a62fc..04e194530b1 100644
--- a/apps/files_sharing/l10n/af_ZA.php
+++ b/apps/files_sharing/l10n/af_ZA.php
@@ -1,4 +1,3 @@
 <?php $TRANSLATIONS = array(
-"Password" => "Wagwoord",
-"web services under your control" => "webdienste onder jou beheer"
+"Password" => "Wagwoord"
 );
diff --git a/apps/files_sharing/l10n/ar.php b/apps/files_sharing/l10n/ar.php
index 4cf3f8c0920..768df3d16ca 100644
--- a/apps/files_sharing/l10n/ar.php
+++ b/apps/files_sharing/l10n/ar.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s شارك المجلد %s معك",
 "%s shared the file %s with you" => "%s شارك الملف %s معك",
 "Download" => "تحميل",
-"No preview available for" => "لا يوجد عرض مسبق لـ",
-"web services under your control" => "خدمات الشبكة تحت سيطرتك"
+"No preview available for" => "لا يوجد عرض مسبق لـ"
 );
diff --git a/apps/files_sharing/l10n/bg_BG.php b/apps/files_sharing/l10n/bg_BG.php
index ac94358c4f9..9fb9f78340b 100644
--- a/apps/files_sharing/l10n/bg_BG.php
+++ b/apps/files_sharing/l10n/bg_BG.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s сподели папката %s с Вас",
 "%s shared the file %s with you" => "%s сподели файла %s с Вас",
 "Download" => "Изтегляне",
-"No preview available for" => "Няма наличен преглед за",
-"web services under your control" => "уеб услуги под Ваш контрол"
+"No preview available for" => "Няма наличен преглед за"
 );
diff --git a/apps/files_sharing/l10n/bn_BD.php b/apps/files_sharing/l10n/bn_BD.php
index 5fdf6de50c0..9fdfee6dfba 100644
--- a/apps/files_sharing/l10n/bn_BD.php
+++ b/apps/files_sharing/l10n/bn_BD.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s আপনার সাথে %s ফোল্ডারটি ভাগাভাগি করেছেন",
 "%s shared the file %s with you" => "%s আপনার সাথে %s ফাইলটি ভাগাভাগি করেছেন",
 "Download" => "ডাউনলোড",
-"No preview available for" => "এর জন্য কোন প্রাকবীক্ষণ সুলভ নয়",
-"web services under your control" => "ওয়েব সার্ভিস আপনার হাতের মুঠোয়"
+"No preview available for" => "এর জন্য কোন প্রাকবীক্ষণ সুলভ নয়"
 );
diff --git a/apps/files_sharing/l10n/ca.php b/apps/files_sharing/l10n/ca.php
index 223495455f0..af924e60dd1 100644
--- a/apps/files_sharing/l10n/ca.php
+++ b/apps/files_sharing/l10n/ca.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s ha compartit la carpeta %s amb vós",
 "%s shared the file %s with you" => "%s ha compartit el fitxer %s amb vós",
 "Download" => "Baixa",
-"No preview available for" => "No hi ha vista prèvia disponible per a",
-"web services under your control" => "controleu els vostres serveis web"
+"No preview available for" => "No hi ha vista prèvia disponible per a"
 );
diff --git a/apps/files_sharing/l10n/cs_CZ.php b/apps/files_sharing/l10n/cs_CZ.php
index 9889fae488a..507955d4bd8 100644
--- a/apps/files_sharing/l10n/cs_CZ.php
+++ b/apps/files_sharing/l10n/cs_CZ.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s s Vámi sdílí složku %s",
 "%s shared the file %s with you" => "%s s Vámi sdílí soubor %s",
 "Download" => "Stáhnout",
-"No preview available for" => "Náhled není dostupný pro",
-"web services under your control" => "služby webu pod Vaší kontrolou"
+"No preview available for" => "Náhled není dostupný pro"
 );
diff --git a/apps/files_sharing/l10n/cy_GB.php b/apps/files_sharing/l10n/cy_GB.php
index dec9af4ebe9..292f87a41ef 100644
--- a/apps/files_sharing/l10n/cy_GB.php
+++ b/apps/files_sharing/l10n/cy_GB.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "Rhannodd %s blygell %s â chi",
 "%s shared the file %s with you" => "Rhannodd %s ffeil %s â chi",
 "Download" => "Llwytho i lawr",
-"No preview available for" => "Does dim rhagolwg ar gael ar gyfer",
-"web services under your control" => "gwasanaethau gwe a reolir gennych"
+"No preview available for" => "Does dim rhagolwg ar gael ar gyfer"
 );
diff --git a/apps/files_sharing/l10n/da.php b/apps/files_sharing/l10n/da.php
index 75fbdabe16f..55d70fec052 100644
--- a/apps/files_sharing/l10n/da.php
+++ b/apps/files_sharing/l10n/da.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s delte mappen %s med dig",
 "%s shared the file %s with you" => "%s delte filen %s med dig",
 "Download" => "Download",
-"No preview available for" => "Forhåndsvisning ikke tilgængelig for",
-"web services under your control" => "Webtjenester under din kontrol"
+"No preview available for" => "Forhåndsvisning ikke tilgængelig for"
 );
diff --git a/apps/files_sharing/l10n/de.php b/apps/files_sharing/l10n/de.php
index 7f4cbb1adad..90fcdcf0f1b 100644
--- a/apps/files_sharing/l10n/de.php
+++ b/apps/files_sharing/l10n/de.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s hat den Ordner %s mit Dir geteilt",
 "%s shared the file %s with you" => "%s hat die Datei %s mit Dir geteilt",
 "Download" => "Download",
-"No preview available for" => "Es ist keine Vorschau verfügbar für",
-"web services under your control" => "Web-Services unter Deiner Kontrolle"
+"No preview available for" => "Es ist keine Vorschau verfügbar für"
 );
diff --git a/apps/files_sharing/l10n/de_DE.php b/apps/files_sharing/l10n/de_DE.php
index ab81589b0eb..4594c7c248d 100644
--- a/apps/files_sharing/l10n/de_DE.php
+++ b/apps/files_sharing/l10n/de_DE.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s hat den Ordner %s mit Ihnen geteilt",
 "%s shared the file %s with you" => "%s hat die Datei %s mit Ihnen geteilt",
 "Download" => "Herunterladen",
-"No preview available for" => "Es ist keine Vorschau verfügbar für",
-"web services under your control" => "Web-Services unter Ihrer Kontrolle"
+"No preview available for" => "Es ist keine Vorschau verfügbar für"
 );
diff --git a/apps/files_sharing/l10n/el.php b/apps/files_sharing/l10n/el.php
index 5305eedd484..28360d03b4e 100644
--- a/apps/files_sharing/l10n/el.php
+++ b/apps/files_sharing/l10n/el.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s μοιράστηκε τον φάκελο %s μαζί σας",
 "%s shared the file %s with you" => "%s μοιράστηκε το αρχείο %s μαζί σας",
 "Download" => "Λήψη",
-"No preview available for" => "Δεν υπάρχει διαθέσιμη προεπισκόπηση για",
-"web services under your control" => "υπηρεσίες δικτύου υπό τον έλεγχό σας"
+"No preview available for" => "Δεν υπάρχει διαθέσιμη προεπισκόπηση για"
 );
diff --git a/apps/files_sharing/l10n/en@pirate.php b/apps/files_sharing/l10n/en@pirate.php
index 02ee8440487..cb40c5a1680 100644
--- a/apps/files_sharing/l10n/en@pirate.php
+++ b/apps/files_sharing/l10n/en@pirate.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s shared the folder %s with you",
 "%s shared the file %s with you" => "%s shared the file %s with you",
 "Download" => "Download",
-"No preview available for" => "No preview available for",
-"web services under your control" => "web services under your control"
+"No preview available for" => "No preview available for"
 );
diff --git a/apps/files_sharing/l10n/eo.php b/apps/files_sharing/l10n/eo.php
index c598d3aa2c4..5a216f1f1a1 100644
--- a/apps/files_sharing/l10n/eo.php
+++ b/apps/files_sharing/l10n/eo.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s kunhavigis la dosierujon %s kun vi",
 "%s shared the file %s with you" => "%s kunhavigis la dosieron %s kun vi",
 "Download" => "Elŝuti",
-"No preview available for" => "Ne haveblas antaŭvido por",
-"web services under your control" => "TTT-servoj regataj de vi"
+"No preview available for" => "Ne haveblas antaŭvido por"
 );
diff --git a/apps/files_sharing/l10n/es.php b/apps/files_sharing/l10n/es.php
index 2023d35903e..61794d9c553 100644
--- a/apps/files_sharing/l10n/es.php
+++ b/apps/files_sharing/l10n/es.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s compartió la carpeta %s contigo",
 "%s shared the file %s with you" => "%s compartió el fichero %s contigo",
 "Download" => "Descargar",
-"No preview available for" => "No hay vista previa disponible para",
-"web services under your control" => "Servicios web bajo su control"
+"No preview available for" => "No hay vista previa disponible para"
 );
diff --git a/apps/files_sharing/l10n/es_AR.php b/apps/files_sharing/l10n/es_AR.php
index a2d6e232f20..b079d05e52c 100644
--- a/apps/files_sharing/l10n/es_AR.php
+++ b/apps/files_sharing/l10n/es_AR.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s compartió la carpeta %s con vos",
 "%s shared the file %s with you" => "%s compartió el archivo %s con vos",
 "Download" => "Descargar",
-"No preview available for" => "La vista preliminar no está disponible para",
-"web services under your control" => "servicios web controlados por vos"
+"No preview available for" => "La vista preliminar no está disponible para"
 );
diff --git a/apps/files_sharing/l10n/et_EE.php b/apps/files_sharing/l10n/et_EE.php
index 36290ad2787..b8f6b5ab067 100644
--- a/apps/files_sharing/l10n/et_EE.php
+++ b/apps/files_sharing/l10n/et_EE.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s jagas sinuga kausta %s",
 "%s shared the file %s with you" => "%s jagas sinuga faili %s",
 "Download" => "Lae alla",
-"No preview available for" => "Eelvaadet pole saadaval",
-"web services under your control" => "veebitenused sinu kontrolli all"
+"No preview available for" => "Eelvaadet pole saadaval"
 );
diff --git a/apps/files_sharing/l10n/eu.php b/apps/files_sharing/l10n/eu.php
index ebef0f445ed..614cdc1717d 100644
--- a/apps/files_sharing/l10n/eu.php
+++ b/apps/files_sharing/l10n/eu.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%sk zurekin %s karpeta elkarbanatu du",
 "%s shared the file %s with you" => "%sk zurekin %s fitxategia elkarbanatu du",
 "Download" => "Deskargatu",
-"No preview available for" => "Ez dago aurrebista eskuragarririk hauentzat ",
-"web services under your control" => "web zerbitzuak zure kontrolpean"
+"No preview available for" => "Ez dago aurrebista eskuragarririk hauentzat "
 );
diff --git a/apps/files_sharing/l10n/fa.php b/apps/files_sharing/l10n/fa.php
index 4313acae1ad..d91daa90ebc 100644
--- a/apps/files_sharing/l10n/fa.php
+++ b/apps/files_sharing/l10n/fa.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%sپوشه %s را با شما به اشتراک گذاشت",
 "%s shared the file %s with you" => "%sفایل %s را با شما به اشتراک گذاشت",
 "Download" => "دانلود",
-"No preview available for" => "هیچگونه پیش نمایشی موجود نیست",
-"web services under your control" => "سرویس های تحت وب در کنترل شما"
+"No preview available for" => "هیچگونه پیش نمایشی موجود نیست"
 );
diff --git a/apps/files_sharing/l10n/fi_FI.php b/apps/files_sharing/l10n/fi_FI.php
index 6c441342133..7e9b67de2ca 100644
--- a/apps/files_sharing/l10n/fi_FI.php
+++ b/apps/files_sharing/l10n/fi_FI.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s jakoi kansion %s kanssasi",
 "%s shared the file %s with you" => "%s jakoi tiedoston %s kanssasi",
 "Download" => "Lataa",
-"No preview available for" => "Ei esikatselua kohteelle",
-"web services under your control" => "verkkopalvelut hallinnassasi"
+"No preview available for" => "Ei esikatselua kohteelle"
 );
diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php
index 1038d819330..b4657978f79 100644
--- a/apps/files_sharing/l10n/fr.php
+++ b/apps/files_sharing/l10n/fr.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s a partagé le répertoire %s avec vous",
 "%s shared the file %s with you" => "%s a partagé le fichier %s avec vous",
 "Download" => "Télécharger",
-"No preview available for" => "Pas d'aperçu disponible pour",
-"web services under your control" => "services web sous votre contrôle"
+"No preview available for" => "Pas d'aperçu disponible pour"
 );
diff --git a/apps/files_sharing/l10n/gl.php b/apps/files_sharing/l10n/gl.php
index d03f1a5005f..90f7a221274 100644
--- a/apps/files_sharing/l10n/gl.php
+++ b/apps/files_sharing/l10n/gl.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s compartiu o cartafol %s con vostede",
 "%s shared the file %s with you" => "%s compartiu o ficheiro %s con vostede",
 "Download" => "Descargar",
-"No preview available for" => "Sen vista previa dispoñíbel para",
-"web services under your control" => "servizos web baixo o seu control"
+"No preview available for" => "Sen vista previa dispoñíbel para"
 );
diff --git a/apps/files_sharing/l10n/he.php b/apps/files_sharing/l10n/he.php
index 2ea5ba76ab1..d0c75e6ba54 100644
--- a/apps/files_sharing/l10n/he.php
+++ b/apps/files_sharing/l10n/he.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s שיתף עמך את התיקייה %s",
 "%s shared the file %s with you" => "%s שיתף עמך את הקובץ %s",
 "Download" => "הורדה",
-"No preview available for" => "אין תצוגה מקדימה זמינה עבור",
-"web services under your control" => "שירותי רשת תחת השליטה שלך"
+"No preview available for" => "אין תצוגה מקדימה זמינה עבור"
 );
diff --git a/apps/files_sharing/l10n/hr.php b/apps/files_sharing/l10n/hr.php
index b2dca866bbd..1d09d09bf5c 100644
--- a/apps/files_sharing/l10n/hr.php
+++ b/apps/files_sharing/l10n/hr.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Lozinka",
 "Submit" => "Pošalji",
-"Download" => "Preuzimanje",
-"web services under your control" => "web usluge pod vašom kontrolom"
+"Download" => "Preuzimanje"
 );
diff --git a/apps/files_sharing/l10n/hu_HU.php b/apps/files_sharing/l10n/hu_HU.php
index f8ca541260d..7184cfa4b37 100644
--- a/apps/files_sharing/l10n/hu_HU.php
+++ b/apps/files_sharing/l10n/hu_HU.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s megosztotta Önnel ezt a mappát: %s",
 "%s shared the file %s with you" => "%s megosztotta Önnel ezt az állományt: %s",
 "Download" => "Letöltés",
-"No preview available for" => "Nem áll rendelkezésre előnézet ehhez: ",
-"web services under your control" => "webszolgáltatások saját kézben"
+"No preview available for" => "Nem áll rendelkezésre előnézet ehhez: "
 );
diff --git a/apps/files_sharing/l10n/ia.php b/apps/files_sharing/l10n/ia.php
index d229135a71d..7db49518a4b 100644
--- a/apps/files_sharing/l10n/ia.php
+++ b/apps/files_sharing/l10n/ia.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Contrasigno",
 "Submit" => "Submitter",
-"Download" => "Discargar",
-"web services under your control" => "servicios web sub tu controlo"
+"Download" => "Discargar"
 );
diff --git a/apps/files_sharing/l10n/id.php b/apps/files_sharing/l10n/id.php
index 95cf84312cd..e27e78b5f6c 100644
--- a/apps/files_sharing/l10n/id.php
+++ b/apps/files_sharing/l10n/id.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s membagikan folder %s dengan Anda",
 "%s shared the file %s with you" => "%s membagikan file %s dengan Anda",
 "Download" => "Unduh",
-"No preview available for" => "Tidak ada pratinjau tersedia untuk",
-"web services under your control" => "layanan web dalam kontrol Anda"
+"No preview available for" => "Tidak ada pratinjau tersedia untuk"
 );
diff --git a/apps/files_sharing/l10n/is.php b/apps/files_sharing/l10n/is.php
index bf1975c54ae..b76d737e6d0 100644
--- a/apps/files_sharing/l10n/is.php
+++ b/apps/files_sharing/l10n/is.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s deildi möppunni %s með þér",
 "%s shared the file %s with you" => "%s deildi skránni %s með þér",
 "Download" => "Niðurhal",
-"No preview available for" => "Yfirlit ekki í boði fyrir",
-"web services under your control" => "vefþjónusta undir þinni stjórn"
+"No preview available for" => "Yfirlit ekki í boði fyrir"
 );
diff --git a/apps/files_sharing/l10n/it.php b/apps/files_sharing/l10n/it.php
index f83ca1446d6..60a1e588e82 100644
--- a/apps/files_sharing/l10n/it.php
+++ b/apps/files_sharing/l10n/it.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s ha condiviso la cartella %s con te",
 "%s shared the file %s with you" => "%s ha condiviso il file %s con te",
 "Download" => "Scarica",
-"No preview available for" => "Nessuna anteprima disponibile per",
-"web services under your control" => "servizi web nelle tue mani"
+"No preview available for" => "Nessuna anteprima disponibile per"
 );
diff --git a/apps/files_sharing/l10n/ja_JP.php b/apps/files_sharing/l10n/ja_JP.php
index 02142e2879a..8f208da10c9 100644
--- a/apps/files_sharing/l10n/ja_JP.php
+++ b/apps/files_sharing/l10n/ja_JP.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s はフォルダー %s をあなたと共有中です",
 "%s shared the file %s with you" => "%s はファイル %s をあなたと共有中です",
 "Download" => "ダウンロード",
-"No preview available for" => "プレビューはありません",
-"web services under your control" => "管理下のウェブサービス"
+"No preview available for" => "プレビューはありません"
 );
diff --git a/apps/files_sharing/l10n/ka_GE.php b/apps/files_sharing/l10n/ka_GE.php
index 6da1a8b019d..4577148d7df 100644
--- a/apps/files_sharing/l10n/ka_GE.php
+++ b/apps/files_sharing/l10n/ka_GE.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s–მა გაგიზიარათ ფოლდერი %s",
 "%s shared the file %s with you" => "%s–მა გაგიზიარათ ფაილი %s",
 "Download" => "ჩამოტვირთვა",
-"No preview available for" => "წინასწარი დათვალიერება შეუძლებელია",
-"web services under your control" => "web services under your control"
+"No preview available for" => "წინასწარი დათვალიერება შეუძლებელია"
 );
diff --git a/apps/files_sharing/l10n/ko.php b/apps/files_sharing/l10n/ko.php
index 600168d9bfa..394c8d12b21 100644
--- a/apps/files_sharing/l10n/ko.php
+++ b/apps/files_sharing/l10n/ko.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s 님이 폴더 %s을(를) 공유하였습니다",
 "%s shared the file %s with you" => "%s 님이 파일 %s을(를) 공유하였습니다",
 "Download" => "다운로드",
-"No preview available for" => "다음 항목을 미리 볼 수 없음:",
-"web services under your control" => "내가 관리하는 웹 서비스"
+"No preview available for" => "다음 항목을 미리 볼 수 없음:"
 );
diff --git a/apps/files_sharing/l10n/ku_IQ.php b/apps/files_sharing/l10n/ku_IQ.php
index 675fc372e15..4a0b53f6c83 100644
--- a/apps/files_sharing/l10n/ku_IQ.php
+++ b/apps/files_sharing/l10n/ku_IQ.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s دابه‌شی کردووه‌ بوخچه‌ی %s له‌گه‌ڵ تۆ",
 "%s shared the file %s with you" => "%s دابه‌شی کردووه‌ په‌ڕگه‌یی %s له‌گه‌ڵ تۆ",
 "Download" => "داگرتن",
-"No preview available for" => "هیچ پێشبینیه‌ك ئاماده‌ نیه بۆ",
-"web services under your control" => "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه"
+"No preview available for" => "هیچ پێشبینیه‌ك ئاماده‌ نیه بۆ"
 );
diff --git a/apps/files_sharing/l10n/lb.php b/apps/files_sharing/l10n/lb.php
index 630866ab4c5..502f934cad0 100644
--- a/apps/files_sharing/l10n/lb.php
+++ b/apps/files_sharing/l10n/lb.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Passwuert",
 "Submit" => "Fortschécken",
-"Download" => "Download",
-"web services under your control" => "Web Servicer ënnert denger Kontroll"
+"Download" => "Download"
 );
diff --git a/apps/files_sharing/l10n/lt_LT.php b/apps/files_sharing/l10n/lt_LT.php
index 40ed115599f..2e09aa206d1 100644
--- a/apps/files_sharing/l10n/lt_LT.php
+++ b/apps/files_sharing/l10n/lt_LT.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s pasidalino su jumis %s aplanku",
 "%s shared the file %s with you" => "%s pasidalino su jumis %s failu",
 "Download" => "Atsisiųsti",
-"No preview available for" => "Peržiūra nėra galima",
-"web services under your control" => "jūsų valdomos web paslaugos"
+"No preview available for" => "Peržiūra nėra galima"
 );
diff --git a/apps/files_sharing/l10n/lv.php b/apps/files_sharing/l10n/lv.php
index 88faeaf9f11..8430f99e6cf 100644
--- a/apps/files_sharing/l10n/lv.php
+++ b/apps/files_sharing/l10n/lv.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s ar jums dalījās ar mapi %s",
 "%s shared the file %s with you" => "%s ar jums dalījās ar datni %s",
 "Download" => "Lejupielādēt",
-"No preview available for" => "Nav pieejams priekšskatījums priekš",
-"web services under your control" => "tīmekļa servisi tavā varā"
+"No preview available for" => "Nav pieejams priekšskatījums priekš"
 );
diff --git a/apps/files_sharing/l10n/mk.php b/apps/files_sharing/l10n/mk.php
index 16c7ee0eb04..3d6e54f52b2 100644
--- a/apps/files_sharing/l10n/mk.php
+++ b/apps/files_sharing/l10n/mk.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s ја сподели папката %s со Вас",
 "%s shared the file %s with you" => "%s ја сподели датотеката %s со Вас",
 "Download" => "Преземи",
-"No preview available for" => "Нема достапно преглед за",
-"web services under your control" => "веб сервиси под Ваша контрола"
+"No preview available for" => "Нема достапно преглед за"
 );
diff --git a/apps/files_sharing/l10n/ms_MY.php b/apps/files_sharing/l10n/ms_MY.php
index 879524afce3..5a1cb1018cc 100644
--- a/apps/files_sharing/l10n/ms_MY.php
+++ b/apps/files_sharing/l10n/ms_MY.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Kata laluan",
 "Submit" => "Hantar",
-"Download" => "Muat turun",
-"web services under your control" => "Perkhidmatan web di bawah kawalan anda"
+"Download" => "Muat turun"
 );
diff --git a/apps/files_sharing/l10n/my_MM.php b/apps/files_sharing/l10n/my_MM.php
index dc7ec17e9c5..4b37ab8b48a 100644
--- a/apps/files_sharing/l10n/my_MM.php
+++ b/apps/files_sharing/l10n/my_MM.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Password" => "စကားဝှက်",
 "Submit" => "ထည့်သွင်းမည်",
-"Download" => "ဒေါင်းလုတ်",
-"web services under your control" => "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services"
+"Download" => "ဒေါင်းလုတ်"
 );
diff --git a/apps/files_sharing/l10n/nb_NO.php b/apps/files_sharing/l10n/nb_NO.php
index 4934c341067..027a07babe3 100644
--- a/apps/files_sharing/l10n/nb_NO.php
+++ b/apps/files_sharing/l10n/nb_NO.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s delte mappen %s med deg",
 "%s shared the file %s with you" => "%s delte filen %s med deg",
 "Download" => "Last ned",
-"No preview available for" => "Forhåndsvisning ikke tilgjengelig for",
-"web services under your control" => "web tjenester du kontrollerer"
+"No preview available for" => "Forhåndsvisning ikke tilgjengelig for"
 );
diff --git a/apps/files_sharing/l10n/nl.php b/apps/files_sharing/l10n/nl.php
index 2cef0254398..837547e16b1 100644
--- a/apps/files_sharing/l10n/nl.php
+++ b/apps/files_sharing/l10n/nl.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s deelt de map %s met u",
 "%s shared the file %s with you" => "%s deelt het bestand %s met u",
 "Download" => "Downloaden",
-"No preview available for" => "Geen voorbeeldweergave beschikbaar voor",
-"web services under your control" => "Webdiensten in eigen beheer"
+"No preview available for" => "Geen voorbeeldweergave beschikbaar voor"
 );
diff --git a/apps/files_sharing/l10n/nn_NO.php b/apps/files_sharing/l10n/nn_NO.php
index aeba545dabc..328fb038b88 100644
--- a/apps/files_sharing/l10n/nn_NO.php
+++ b/apps/files_sharing/l10n/nn_NO.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s delte mappa %s med deg",
 "%s shared the file %s with you" => "%s delte fila %s med deg",
 "Download" => "Last ned",
-"No preview available for" => "Inga førehandsvising tilgjengeleg for",
-"web services under your control" => "Vev tjenester under din kontroll"
+"No preview available for" => "Inga førehandsvising tilgjengeleg for"
 );
diff --git a/apps/files_sharing/l10n/oc.php b/apps/files_sharing/l10n/oc.php
index 07bc26ecdd4..2fe0c95aa76 100644
--- a/apps/files_sharing/l10n/oc.php
+++ b/apps/files_sharing/l10n/oc.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Senhal",
 "Submit" => "Sosmetre",
-"Download" => "Avalcarga",
-"web services under your control" => "Services web jos ton contraròtle"
+"Download" => "Avalcarga"
 );
diff --git a/apps/files_sharing/l10n/pl.php b/apps/files_sharing/l10n/pl.php
index 9db5e87c9ba..c85a11863bd 100644
--- a/apps/files_sharing/l10n/pl.php
+++ b/apps/files_sharing/l10n/pl.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s współdzieli folder z tobą %s",
 "%s shared the file %s with you" => "%s współdzieli z tobą plik %s",
 "Download" => "Pobierz",
-"No preview available for" => "Podgląd nie jest dostępny dla",
-"web services under your control" => "Kontrolowane serwisy"
+"No preview available for" => "Podgląd nie jest dostępny dla"
 );
diff --git a/apps/files_sharing/l10n/pt_BR.php b/apps/files_sharing/l10n/pt_BR.php
index ce4c28ddcb5..a5dad793c4e 100644
--- a/apps/files_sharing/l10n/pt_BR.php
+++ b/apps/files_sharing/l10n/pt_BR.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s compartilhou a pasta %s com você",
 "%s shared the file %s with you" => "%s compartilhou o arquivo %s com você",
 "Download" => "Baixar",
-"No preview available for" => "Nenhuma visualização disponível para",
-"web services under your control" => "serviços web sob seu controle"
+"No preview available for" => "Nenhuma visualização disponível para"
 );
diff --git a/apps/files_sharing/l10n/pt_PT.php b/apps/files_sharing/l10n/pt_PT.php
index 43e8f3c4b69..de8fcbf02d9 100644
--- a/apps/files_sharing/l10n/pt_PT.php
+++ b/apps/files_sharing/l10n/pt_PT.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s partilhou a pasta %s consigo",
 "%s shared the file %s with you" => "%s partilhou o ficheiro %s consigo",
 "Download" => "Transferir",
-"No preview available for" => "Não há pré-visualização para",
-"web services under your control" => "serviços web sob o seu controlo"
+"No preview available for" => "Não há pré-visualização para"
 );
diff --git a/apps/files_sharing/l10n/ro.php b/apps/files_sharing/l10n/ro.php
index eb9977dc585..8b8eab13541 100644
--- a/apps/files_sharing/l10n/ro.php
+++ b/apps/files_sharing/l10n/ro.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s a partajat directorul %s cu tine",
 "%s shared the file %s with you" => "%s a partajat fișierul %s cu tine",
 "Download" => "Descarcă",
-"No preview available for" => "Nici o previzualizare disponibilă pentru ",
-"web services under your control" => "servicii web controlate de tine"
+"No preview available for" => "Nici o previzualizare disponibilă pentru "
 );
diff --git a/apps/files_sharing/l10n/ru.php b/apps/files_sharing/l10n/ru.php
index 7fd116e0aae..066096f5b5a 100644
--- a/apps/files_sharing/l10n/ru.php
+++ b/apps/files_sharing/l10n/ru.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s открыл доступ к папке %s для Вас",
 "%s shared the file %s with you" => "%s открыл доступ к файлу %s для Вас",
 "Download" => "Скачать",
-"No preview available for" => "Предпросмотр недоступен для",
-"web services under your control" => "веб-сервисы под вашим управлением"
+"No preview available for" => "Предпросмотр недоступен для"
 );
diff --git a/apps/files_sharing/l10n/si_LK.php b/apps/files_sharing/l10n/si_LK.php
index 580f7b1990a..b9bcab28c95 100644
--- a/apps/files_sharing/l10n/si_LK.php
+++ b/apps/files_sharing/l10n/si_LK.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s ඔබව %s ෆෝල්ඩරයට හවුල් කරගත්තේය",
 "%s shared the file %s with you" => "%s ඔබ සමඟ %s ගොනුව බෙදාහදාගත්තේය",
 "Download" => "බාන්න",
-"No preview available for" => "පූර්වදර්ශනයක් නොමැත",
-"web services under your control" => "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්"
+"No preview available for" => "පූර්වදර්ශනයක් නොමැත"
 );
diff --git a/apps/files_sharing/l10n/sk_SK.php b/apps/files_sharing/l10n/sk_SK.php
index 14124eeb874..0907e3b451c 100644
--- a/apps/files_sharing/l10n/sk_SK.php
+++ b/apps/files_sharing/l10n/sk_SK.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s zdieľa s vami priečinok %s",
 "%s shared the file %s with you" => "%s zdieľa s vami súbor %s",
 "Download" => "Sťahovanie",
-"No preview available for" => "Žiaden náhľad k dispozícii pre",
-"web services under your control" => "webové služby pod Vašou kontrolou"
+"No preview available for" => "Žiaden náhľad k dispozícii pre"
 );
diff --git a/apps/files_sharing/l10n/sl.php b/apps/files_sharing/l10n/sl.php
index 6bcbb0070b3..ae84c472892 100644
--- a/apps/files_sharing/l10n/sl.php
+++ b/apps/files_sharing/l10n/sl.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "Oseba %s je določila mapo %s za souporabo",
 "%s shared the file %s with you" => "Oseba %s je določila datoteko %s za souporabo",
 "Download" => "Prejmi",
-"No preview available for" => "Predogled ni na voljo za",
-"web services under your control" => "spletne storitve pod vašim nadzorom"
+"No preview available for" => "Predogled ni na voljo za"
 );
diff --git a/apps/files_sharing/l10n/sq.php b/apps/files_sharing/l10n/sq.php
index 244ca87c552..7be5f560faa 100644
--- a/apps/files_sharing/l10n/sq.php
+++ b/apps/files_sharing/l10n/sq.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s ndau me ju dosjen %s",
 "%s shared the file %s with you" => "%s ndau me ju skedarin %s",
 "Download" => "Shkarko",
-"No preview available for" => "Shikimi paraprak nuk është i mundur për",
-"web services under your control" => "shërbime web nën kontrollin tënd"
+"No preview available for" => "Shikimi paraprak nuk është i mundur për"
 );
diff --git a/apps/files_sharing/l10n/sr.php b/apps/files_sharing/l10n/sr.php
index be24c06e465..6e277f67711 100644
--- a/apps/files_sharing/l10n/sr.php
+++ b/apps/files_sharing/l10n/sr.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Лозинка",
 "Submit" => "Пошаљи",
-"Download" => "Преузми",
-"web services under your control" => "веб сервиси под контролом"
+"Download" => "Преузми"
 );
diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php
index d1c9afff07c..af21d869adc 100644
--- a/apps/files_sharing/l10n/sv.php
+++ b/apps/files_sharing/l10n/sv.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s delade mappen %s med dig",
 "%s shared the file %s with you" => "%s delade filen %s med dig",
 "Download" => "Ladda ner",
-"No preview available for" => "Ingen förhandsgranskning tillgänglig för",
-"web services under your control" => "webbtjänster under din kontroll"
+"No preview available for" => "Ingen förhandsgranskning tillgänglig för"
 );
diff --git a/apps/files_sharing/l10n/ta_LK.php b/apps/files_sharing/l10n/ta_LK.php
index 6cf6f6236b7..6b2ac30bcd4 100644
--- a/apps/files_sharing/l10n/ta_LK.php
+++ b/apps/files_sharing/l10n/ta_LK.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s கோப்புறையானது %s உடன் பகிரப்பட்டது",
 "%s shared the file %s with you" => "%s கோப்பானது %s உடன் பகிரப்பட்டது",
 "Download" => "பதிவிறக்குக",
-"No preview available for" => "அதற்கு முன்னோக்கு ஒன்றும் இல்லை",
-"web services under your control" => "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது"
+"No preview available for" => "அதற்கு முன்னோக்கு ஒன்றும் இல்லை"
 );
diff --git a/apps/files_sharing/l10n/th_TH.php b/apps/files_sharing/l10n/th_TH.php
index 9d53d65f8ab..e16ecea96ef 100644
--- a/apps/files_sharing/l10n/th_TH.php
+++ b/apps/files_sharing/l10n/th_TH.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s ได้แชร์โฟลเดอร์ %s ให้กับคุณ",
 "%s shared the file %s with you" => "%s ได้แชร์ไฟล์ %s ให้กับคุณ",
 "Download" => "ดาวน์โหลด",
-"No preview available for" => "ไม่สามารถดูตัวอย่างได้สำหรับ",
-"web services under your control" => "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้"
+"No preview available for" => "ไม่สามารถดูตัวอย่างได้สำหรับ"
 );
diff --git a/apps/files_sharing/l10n/tr.php b/apps/files_sharing/l10n/tr.php
index 42dfec8cc6f..4de33557382 100644
--- a/apps/files_sharing/l10n/tr.php
+++ b/apps/files_sharing/l10n/tr.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s sizinle paylaşılan  %s klasör",
 "%s shared the file %s with you" => "%s sizinle paylaşılan  %s klasör",
 "Download" => "İndir",
-"No preview available for" => "Kullanılabilir önizleme yok",
-"web services under your control" => "Bilgileriniz güvenli ve şifreli"
+"No preview available for" => "Kullanılabilir önizleme yok"
 );
diff --git a/apps/files_sharing/l10n/uk.php b/apps/files_sharing/l10n/uk.php
index 8e1fa4bc980..207988ef732 100644
--- a/apps/files_sharing/l10n/uk.php
+++ b/apps/files_sharing/l10n/uk.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s опублікував каталог %s для Вас",
 "%s shared the file %s with you" => "%s опублікував файл %s для Вас",
 "Download" => "Завантажити",
-"No preview available for" => "Попередній перегляд недоступний для",
-"web services under your control" => "підконтрольні Вам веб-сервіси"
+"No preview available for" => "Попередній перегляд недоступний для"
 );
diff --git a/apps/files_sharing/l10n/ur_PK.php b/apps/files_sharing/l10n/ur_PK.php
index f68b714350f..745f2f930d1 100644
--- a/apps/files_sharing/l10n/ur_PK.php
+++ b/apps/files_sharing/l10n/ur_PK.php
@@ -1,4 +1,3 @@
 <?php $TRANSLATIONS = array(
-"Password" => "پاسورڈ",
-"web services under your control" => "آپ کے اختیار میں ویب سروسیز"
+"Password" => "پاسورڈ"
 );
diff --git a/apps/files_sharing/l10n/vi.php b/apps/files_sharing/l10n/vi.php
index afeec5c6481..2a5a2ff17f1 100644
--- a/apps/files_sharing/l10n/vi.php
+++ b/apps/files_sharing/l10n/vi.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s đã chia sẻ thư mục %s với bạn",
 "%s shared the file %s with you" => "%s đã chia sẻ tập tin %s với bạn",
 "Download" => "Tải về",
-"No preview available for" => "Không có xem trước cho",
-"web services under your control" => "dịch vụ web dưới sự kiểm soát của bạn"
+"No preview available for" => "Không có xem trước cho"
 );
diff --git a/apps/files_sharing/l10n/zh_CN.GB2312.php b/apps/files_sharing/l10n/zh_CN.GB2312.php
index 117ec8f4065..7df3ee8f9b1 100644
--- a/apps/files_sharing/l10n/zh_CN.GB2312.php
+++ b/apps/files_sharing/l10n/zh_CN.GB2312.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s 与您分享了文件夹 %s",
 "%s shared the file %s with you" => "%s 与您分享了文件 %s",
 "Download" => "下载",
-"No preview available for" => "没有预览可用于",
-"web services under your control" => "您控制的网络服务"
+"No preview available for" => "没有预览可用于"
 );
diff --git a/apps/files_sharing/l10n/zh_CN.php b/apps/files_sharing/l10n/zh_CN.php
index 64e7af3e0cd..15c1bb54873 100644
--- a/apps/files_sharing/l10n/zh_CN.php
+++ b/apps/files_sharing/l10n/zh_CN.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s与您共享了%s文件夹",
 "%s shared the file %s with you" => "%s与您共享了%s文件",
 "Download" => "下载",
-"No preview available for" => "没有预览",
-"web services under your control" => "您控制的web服务"
+"No preview available for" => "没有预览"
 );
diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php
index 14e4466ecb6..23b27789943 100644
--- a/apps/files_sharing/l10n/zh_TW.php
+++ b/apps/files_sharing/l10n/zh_TW.php
@@ -4,6 +4,5 @@
 "%s shared the folder %s with you" => "%s 和您分享了資料夾 %s ",
 "%s shared the file %s with you" => "%s 和您分享了檔案 %s",
 "Download" => "下載",
-"No preview available for" => "無法預覽",
-"web services under your control" => "由您控制的網路服務"
+"No preview available for" => "無法預覽"
 );
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 88a4cc242ba..adf3c3e9cc8 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -46,5 +46,9 @@
 		<?php endif; ?>
 	<?php endif; ?>
 </div>
-<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash;
-<?php p($l->t('web services under your control')); ?></p></footer>
+<footer>
+	<p class="info"><a href="<?php p(OC_Defaults::getBaseUrl()); ?>"><?php p(OC_Defaults::getEntity()) ?></a>
+		<?php OC_Util::getEditionString() === '' ? print_unescaped(' &ndash; ') : print_unescaped('<br/>'); ?>
+		<?php p(OC_Defaults::getSlogan()); ?>
+	</p>
+</footer>
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index 2d1830a38f1..7b8d3cb4252 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -50,12 +50,19 @@ class Trashbin {
 		$view = new \OC\Files\View('/'. $user);
 		if (!$view->is_dir('files_trashbin')) {
 			$view->mkdir('files_trashbin');
+		}
+		if (!$view->is_dir('files_trashbin/files')) {
 			$view->mkdir('files_trashbin/files');
+		}
+		if (!$view->is_dir('files_trashbin/versions')) {
 			$view->mkdir('files_trashbin/versions');
+		}
+		if (!$view->is_dir('files_trashbin/keyfiles')) {
 			$view->mkdir('files_trashbin/keyfiles');
-            $view->mkdir('files_trashbin/share-keys');
 		}
-
+		if (!$view->is_dir('files_trashbin/share-keys')) {
+			$view->mkdir('files_trashbin/share-keys');
+		}
 		$path_parts = pathinfo($file_path);
 
 		$filename = $path_parts['basename'];
diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php
index 98fb32b1d26..011ff3e12ff 100644
--- a/apps/user_ldap/l10n/es_AR.php
+++ b/apps/user_ldap/l10n/es_AR.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "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 valida y la conexión pudo ser establecida.",
+"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.",
 "The configuration is invalid. Please look in the ownCloud log for further details." => "La configuración no es válida. Por favor, buscá en el log de ownCloud más detalles.",
 "Deletion failed" => "Error al borrar",
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index ed1e0f376db..308fd34760a 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Falhou a limpar os mapas",
 "Failed to delete the server configuration" => "Erro ao eliminar as configurações do servidor",
 "The configuration is valid and the connection could be established!" => "A configuração está correcta e foi possível estabelecer a ligação!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A configuração está correcta, mas não foi possível estabelecer o \"laço\", por favor, verifique as configurações do servidor e as credenciais.",
@@ -7,6 +8,7 @@
 "Take over settings from recent server configuration?" => "Assumir as configurações da configuração do servidor mais recente?",
 "Keep settings?" => "Manter as definições?",
 "Cannot add server configuration" => "Não foi possível adicionar as configurações do servidor.",
+"mappings cleared" => "Mapas limpos",
 "Success" => "Sucesso",
 "Error" => "Erro",
 "Connection test succeeded" => "Teste de conecção passado com sucesso.",
@@ -72,6 +74,13 @@
 "Email Field" => "Campo de email",
 "User Home Folder Naming Rule" => "Regra da pasta inicial do utilizador",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixe vazio para nome de utilizador (padrão). De outro modo, especifique um atributo LDAP/AD.",
+"Internal Username" => "Nome de utilizador interno",
+"Internal Username Attribute:" => "Atributo do nome de utilizador interno",
+"Override UUID detection" => "Passar a detecção do UUID",
+"UUID Attribute:" => "Atributo UUID:",
+"Username-LDAP User Mapping" => "Mapeamento do utilizador LDAP",
+"Clear Username-LDAP User Mapping" => "Limpar mapeamento do utilizador-LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Limpar o mapeamento do nome de grupo LDAP",
 "Test Configuration" => "Testar a configuração",
 "Help" => "Ajuda"
 );
diff --git a/apps/user_webdavauth/l10n/ar.php b/apps/user_webdavauth/l10n/ar.php
index c17302f7bb1..78b347e51fa 100644
--- a/apps/user_webdavauth/l10n/ar.php
+++ b/apps/user_webdavauth/l10n/ar.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "تأكد شخصية ال WebDAV",
-"URL: http://" => "الرابط: http://",
 "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 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."
 );
diff --git a/apps/user_webdavauth/l10n/bg_BG.php b/apps/user_webdavauth/l10n/bg_BG.php
index a3bd703b258..61503db8392 100644
--- a/apps/user_webdavauth/l10n/bg_BG.php
+++ b/apps/user_webdavauth/l10n/bg_BG.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV идентификация",
-"URL: http://" => "URL: http://",
 "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. "
 );
diff --git a/apps/user_webdavauth/l10n/ca.php b/apps/user_webdavauth/l10n/ca.php
index 7ac540f2130..339e4dbe688 100644
--- a/apps/user_webdavauth/l10n/ca.php
+++ b/apps/user_webdavauth/l10n/ca.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Autenticació WebDAV",
-"URL: http://" => "URL: http://",
+"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 enviarà les credencials d'usuari a aquesta URL. Aquest endollable en comprova la resposta i interpretarà els codis d'estat 401 i 403 com a credencials no vàlides, i qualsevol altra resposta com a credencials vàlides."
 );
diff --git a/apps/user_webdavauth/l10n/cs_CZ.php b/apps/user_webdavauth/l10n/cs_CZ.php
index 9bd4c96a2bb..17308ef4226 100644
--- a/apps/user_webdavauth/l10n/cs_CZ.php
+++ b/apps/user_webdavauth/l10n/cs_CZ.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Ověření WebDAV",
-"URL: http://" => "URL: http://",
 "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 odešle uživatelské údaje na zadanou URL. Plugin zkontroluje odpověď a považuje návratovou hodnotu HTTP 401 a 403 za neplatné údaje a všechny ostatní hodnoty jako platné přihlašovací údaje."
 );
diff --git a/apps/user_webdavauth/l10n/da.php b/apps/user_webdavauth/l10n/da.php
index b268d3e15d0..0d1190ba222 100644
--- a/apps/user_webdavauth/l10n/da.php
+++ b/apps/user_webdavauth/l10n/da.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV-godkendelse",
-"URL: http://" => "URL: http://",
 "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 vil sende brugerens oplysninger til denne URL. Plugin'et registrerer responsen og fortolker HTTP-statuskoder 401 og 403 som ugyldige oplysninger, men alle andre besvarelser som gyldige oplysninger."
 );
diff --git a/apps/user_webdavauth/l10n/de.php b/apps/user_webdavauth/l10n/de.php
index c86ff44e55c..e2db395b1c6 100644
--- a/apps/user_webdavauth/l10n/de.php
+++ b/apps/user_webdavauth/l10n/de.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV Authentifikation",
-"URL: http://" => "URL: http://",
 "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."
 );
diff --git a/apps/user_webdavauth/l10n/de_DE.php b/apps/user_webdavauth/l10n/de_DE.php
index 1aecfd29968..4ca749e898d 100644
--- a/apps/user_webdavauth/l10n/de_DE.php
+++ b/apps/user_webdavauth/l10n/de_DE.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV-Authentifizierung",
-"URL: http://" => "URL: http://",
 "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."
 );
diff --git a/apps/user_webdavauth/l10n/el.php b/apps/user_webdavauth/l10n/el.php
index 951709c4d64..1943b98a750 100644
--- a/apps/user_webdavauth/l10n/el.php
+++ b/apps/user_webdavauth/l10n/el.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Αυθεντικοποίηση μέσω WebDAV ",
-"URL: http://" => "URL: http://",
 "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 για μη έγκυρα, όλες οι υπόλοιπες απαντήσεις είναι έγκυρες."
 );
diff --git a/apps/user_webdavauth/l10n/eo.php b/apps/user_webdavauth/l10n/eo.php
index d945f181e6b..0e1fda7c4c2 100644
--- a/apps/user_webdavauth/l10n/eo.php
+++ b/apps/user_webdavauth/l10n/eo.php
@@ -1,4 +1,3 @@
 <?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV-aŭtentigo",
-"URL: http://" => "URL: http://"
+"WebDAV Authentication" => "WebDAV-aŭtentigo"
 );
diff --git a/apps/user_webdavauth/l10n/es.php b/apps/user_webdavauth/l10n/es.php
index 103c3738e2d..18c87794d65 100644
--- a/apps/user_webdavauth/l10n/es.php
+++ b/apps/user_webdavauth/l10n/es.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Autenticación de WevDAV",
-"URL: http://" => "URL: http://",
+"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."
 );
diff --git a/apps/user_webdavauth/l10n/es_AR.php b/apps/user_webdavauth/l10n/es_AR.php
index 103c3738e2d..efb82288287 100644
--- a/apps/user_webdavauth/l10n/es_AR.php
+++ b/apps/user_webdavauth/l10n/es_AR.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Autenticación de WevDAV",
-"URL: http://" => "URL: http://",
 "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."
 );
diff --git a/apps/user_webdavauth/l10n/et_EE.php b/apps/user_webdavauth/l10n/et_EE.php
index a3b86224ac2..470cb2b0f10 100644
--- a/apps/user_webdavauth/l10n/et_EE.php
+++ b/apps/user_webdavauth/l10n/et_EE.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV autentimine",
-"URL: http://" => "URL: http://",
 "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 saadab kasutajatunnused sellel aadressil. See vidin kontrollib vastust ning tuvastab HTTP vastuskoodid 401 ja 403 kui vigased, ning kõik teised vastused kui korrektsed kasutajatunnused."
 );
diff --git a/apps/user_webdavauth/l10n/eu.php b/apps/user_webdavauth/l10n/eu.php
index d792c1588bb..6395d7fc1e0 100644
--- a/apps/user_webdavauth/l10n/eu.php
+++ b/apps/user_webdavauth/l10n/eu.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV Autentikazioa",
-"URL: http://" => "URL: http://",
 "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." => "ownCloudek erabiltzailearen kredentzialak URL honetara bidaliko ditu. Plugin honek erantzuna aztertzen du eta HTTP 401 eta 403 egoera kodeak baliogabezko kredentzialtzat hartuko ditu, beste erantzunak kredentzial egokitzat hartuko dituelarik."
 );
diff --git a/apps/user_webdavauth/l10n/fi_FI.php b/apps/user_webdavauth/l10n/fi_FI.php
index 6c67c78c812..61a848bcfe4 100644
--- a/apps/user_webdavauth/l10n/fi_FI.php
+++ b/apps/user_webdavauth/l10n/fi_FI.php
@@ -1,4 +1,3 @@
 <?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV-todennus",
-"URL: http://" => "Osoite: http://"
+"WebDAV Authentication" => "WebDAV-todennus"
 );
diff --git a/apps/user_webdavauth/l10n/fr.php b/apps/user_webdavauth/l10n/fr.php
index 9d528a3a9d2..e7fad26287c 100644
--- a/apps/user_webdavauth/l10n/fr.php
+++ b/apps/user_webdavauth/l10n/fr.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Authentification WebDAV",
-"URL: http://" => "URL : http://",
+"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 enverra les informations de connexion à cette adresse. Ce module complémentaire analyse le code réponse HTTP et considère tout code différent des codes 401 et 403 comme associé à une authentification correcte."
 );
diff --git a/apps/user_webdavauth/l10n/gl.php b/apps/user_webdavauth/l10n/gl.php
index f63a7cb0ce8..35ed8a1969f 100644
--- a/apps/user_webdavauth/l10n/gl.php
+++ b/apps/user_webdavauth/l10n/gl.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Autenticación WebDAV",
-"URL: http://" => "URL: http://",
+"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 enviará as credenciais do usuario a este URL. Este engadido comproba a resposta e interpretará os códigos de estado HTTP 401 e 403 como credenciais incorrectas, e todas as outras respostas como credenciais correctas."
 );
diff --git a/apps/user_webdavauth/l10n/he.php b/apps/user_webdavauth/l10n/he.php
index 9ab6b83bc7c..aee7b00f185 100644
--- a/apps/user_webdavauth/l10n/he.php
+++ b/apps/user_webdavauth/l10n/he.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "הזדהות מול WebDAV",
-"URL: http://" => "כתובת: http://‎",
 "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 תשלח את פרטי המשתמש לכתובת זו. התוסף יבדוק את התגובה ויתרגם את הקודים 401 ו־403 כתגובה לציון פרטי גישה שגויים ואת כל שאר התגובות כפרטי גישה נכונים."
 );
diff --git a/apps/user_webdavauth/l10n/hu_HU.php b/apps/user_webdavauth/l10n/hu_HU.php
index 64352801142..d7de5e57f3b 100644
--- a/apps/user_webdavauth/l10n/hu_HU.php
+++ b/apps/user_webdavauth/l10n/hu_HU.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV hitelesítés",
-"URL: http://" => "URL: http://",
 "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." => "Az ownCloud elküldi a felhasználói fiók adatai a következő URL-re. Ez a bővítőmodul leellenőrzi a választ és ha a HTTP hibakód nem 401 vagy 403 azaz érvénytelen hitelesítő, akkor minden más válasz érvényes lesz."
 );
diff --git a/apps/user_webdavauth/l10n/id.php b/apps/user_webdavauth/l10n/id.php
index 4324ee8ff52..8ddf54e4735 100644
--- a/apps/user_webdavauth/l10n/id.php
+++ b/apps/user_webdavauth/l10n/id.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Otentikasi WebDAV",
-"URL: http://" => "URL: http://",
 "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 akan mengirimkan informasi pengguna ke URL ini. Pengaya akan mengecek respon dan menginterpretasikan kode status HTTP 401 serta 403 sebagai informasi yang keliru, sedangkan respon lainnya dianggap benar."
 );
diff --git a/apps/user_webdavauth/l10n/is.php b/apps/user_webdavauth/l10n/is.php
index bb59ef5e445..10dcfa6e3d3 100644
--- a/apps/user_webdavauth/l10n/is.php
+++ b/apps/user_webdavauth/l10n/is.php
@@ -1,4 +1,3 @@
 <?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV Auðkenni",
-"URL: http://" => "Vefslóð: http://"
+"WebDAV Authentication" => "WebDAV Auðkenni"
 );
diff --git a/apps/user_webdavauth/l10n/it.php b/apps/user_webdavauth/l10n/it.php
index a7cd6e8e4b4..1c1e0899b1d 100644
--- a/apps/user_webdavauth/l10n/it.php
+++ b/apps/user_webdavauth/l10n/it.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Autenticazione WebDAV",
-"URL: http://" => "URL: http://",
+"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 invierà le credenziali dell'utente a questo URL. Questa estensione controlla la risposta e interpreta i codici di stato 401 e 403 come credenziali non valide, e tutte le altre risposte come credenziali valide."
 );
diff --git a/apps/user_webdavauth/l10n/ja_JP.php b/apps/user_webdavauth/l10n/ja_JP.php
index 1cd14a03c72..703cc71489e 100644
--- a/apps/user_webdavauth/l10n/ja_JP.php
+++ b/apps/user_webdavauth/l10n/ja_JP.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV 認証",
-"URL: http://" => "URL: http://",
+"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にユーザ資格情報を送信します。このプラグインは応答をチェックし、HTTP状態コードが 401 と 403 の場合は無効な資格情報とし、他の応答はすべて有効な資格情報として処理します。"
 );
diff --git a/apps/user_webdavauth/l10n/ka_GE.php b/apps/user_webdavauth/l10n/ka_GE.php
index f475ea0b737..34c502cc5eb 100644
--- a/apps/user_webdavauth/l10n/ka_GE.php
+++ b/apps/user_webdavauth/l10n/ka_GE.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV აუთენთიფიკაცია",
-"URL: http://" => "URL: http://",
 "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–ზე. ეს პლაგინი შეამოწმებს პასუხს და მოახდენს მის ინტერპრეტაციას HTTP სტატუსკოდებში 401 და 403 დაუშვებელი მონაცემებისთვის, ხოლო სხვა დანარჩენს დაშვებადი მონაცემებისთვის."
 );
diff --git a/apps/user_webdavauth/l10n/ko.php b/apps/user_webdavauth/l10n/ko.php
index 578ff35e721..e0431164a53 100644
--- a/apps/user_webdavauth/l10n/ko.php
+++ b/apps/user_webdavauth/l10n/ko.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV 인증",
-"URL: http://" => "URL: http://",
 "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로 사용자 인증 정보를 보냅니다. 이 플러그인은 응답을 확인하여 HTTP 상태 코드 401이나 403이 돌아온 경우에 잘못된 인증 정보로 간주합니다. 다른 모든 상태 코드는 올바른 인증 정보로 간주합니다."
 );
diff --git a/apps/user_webdavauth/l10n/lt_LT.php b/apps/user_webdavauth/l10n/lt_LT.php
index 8d0492ae487..ed81efdf8bf 100644
--- a/apps/user_webdavauth/l10n/lt_LT.php
+++ b/apps/user_webdavauth/l10n/lt_LT.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV autorizavimas",
-"URL: http://" => "Adresas: http://",
 "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 išsiųs naudotojo duomenis į šį WWW adresą. Šis įskiepis patikrins gautą atsakymą ir interpretuos HTTP būsenos kodą 401 ir 403 kaip negaliojančius duomenis, ir visus kitus gautus atsakymus kaip galiojančius duomenis. "
 );
diff --git a/apps/user_webdavauth/l10n/lv.php b/apps/user_webdavauth/l10n/lv.php
index d0043df9f07..7f90f64d215 100644
--- a/apps/user_webdavauth/l10n/lv.php
+++ b/apps/user_webdavauth/l10n/lv.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV autentifikācija",
-"URL: http://" => "URL: http://",
 "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 sūtīs lietotāja akreditācijas datus uz šo URL. Šis spraudnis pārbauda atbildi un interpretē HTTP statusa kodus 401 un 403 kā nederīgus akreditācijas datus un visas citas atbildes kā derīgus akreditācijas datus."
 );
diff --git a/apps/user_webdavauth/l10n/nl.php b/apps/user_webdavauth/l10n/nl.php
index 7d1bb33923e..086f8ad2ea9 100644
--- a/apps/user_webdavauth/l10n/nl.php
+++ b/apps/user_webdavauth/l10n/nl.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV authenticatie",
-"URL: http://" => "URL: http://",
+"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 stuurt de inloggegevens naar deze URL. Deze plugin controleert het antwoord en interpreteert de HTTP statuscodes 401 als 403 als ongeldige inloggegevens, maar alle andere antwoorden als geldige inloggegevens."
 );
diff --git a/apps/user_webdavauth/l10n/nn_NO.php b/apps/user_webdavauth/l10n/nn_NO.php
index 772e084b631..5c4184b33a8 100644
--- a/apps/user_webdavauth/l10n/nn_NO.php
+++ b/apps/user_webdavauth/l10n/nn_NO.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV-autentisering",
-"URL: http://" => "Nettadresse: http://",
 "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 sender brukarakkreditiv til denne nettadressa. Dette programtillegget kontrollerer svaret og tolkar HTTP-statuskodane 401 og 403 som ugyldige, og alle andre svar som gyldige."
 );
diff --git a/apps/user_webdavauth/l10n/pl.php b/apps/user_webdavauth/l10n/pl.php
index 4887e935316..e18b4787d57 100644
--- a/apps/user_webdavauth/l10n/pl.php
+++ b/apps/user_webdavauth/l10n/pl.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Uwierzytelnienie WebDAV",
-"URL: http://" => "URL: http://",
 "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 wyśle dane uwierzytelniające do tego URL. Ten plugin sprawdza odpowiedź i zinterpretuje kody HTTP 401 oraz 403 jako nieprawidłowe dane uwierzytelniające, a każdy inny kod odpowiedzi jako poprawne dane."
 );
diff --git a/apps/user_webdavauth/l10n/pt_BR.php b/apps/user_webdavauth/l10n/pt_BR.php
index 6ddd00ccc3e..1f96b75462a 100644
--- a/apps/user_webdavauth/l10n/pt_BR.php
+++ b/apps/user_webdavauth/l10n/pt_BR.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Autenticação WebDAV",
-"URL: http://" => "URL: http://",
 "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."
 );
diff --git a/apps/user_webdavauth/l10n/pt_PT.php b/apps/user_webdavauth/l10n/pt_PT.php
index d7e87b5c8d1..eec1a328e1d 100644
--- a/apps/user_webdavauth/l10n/pt_PT.php
+++ b/apps/user_webdavauth/l10n/pt_PT.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Autenticação WebDAV",
-"URL: http://" => "URL: http://",
 "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 vai enviar as credenciais do utilizador através deste URL. Este plugin verifica a resposta e vai interpretar os códigos de estado HTTP 401 e 403 como credenciais inválidas, e todas as outras como válidas."
 );
diff --git a/apps/user_webdavauth/l10n/ro.php b/apps/user_webdavauth/l10n/ro.php
index 9df490e81ec..bccd7d50e22 100644
--- a/apps/user_webdavauth/l10n/ro.php
+++ b/apps/user_webdavauth/l10n/ro.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Autentificare WebDAV",
-"URL: http://" => "URL: http://",
 "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 va trimite datele de autentificare la acest URL. Acest modul verifică răspunsul și va interpreta codurile de status HTTP 401 sau 403 ca fiind date de autentificare invalide, și orice alt răspuns ca fiind date valide."
 );
diff --git a/apps/user_webdavauth/l10n/ru.php b/apps/user_webdavauth/l10n/ru.php
index f12982fc406..ad3dfd2e67f 100644
--- a/apps/user_webdavauth/l10n/ru.php
+++ b/apps/user_webdavauth/l10n/ru.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Идентификация WebDAV",
-"URL: http://" => "URL: http://",
 "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. Затем плагин проверит ответ, в случае HTTP ответа 401 или 403 данные будут считаться неверными, при любых других ответах - верными."
 );
diff --git a/apps/user_webdavauth/l10n/sk_SK.php b/apps/user_webdavauth/l10n/sk_SK.php
index c4e6dfddc7b..589a82dc6f5 100644
--- a/apps/user_webdavauth/l10n/sk_SK.php
+++ b/apps/user_webdavauth/l10n/sk_SK.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV overenie",
-"URL: http://" => "URL: http://",
 "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."
 );
diff --git a/apps/user_webdavauth/l10n/sl.php b/apps/user_webdavauth/l10n/sl.php
index 7c592723af6..6bae847dc34 100644
--- a/apps/user_webdavauth/l10n/sl.php
+++ b/apps/user_webdavauth/l10n/sl.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Overitev WebDAV",
-"URL: http://" => "URL: http://",
 "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." => "Sistem ownCloud bo poslal uporabniška poverila na navedeni naslov URL. Ta vstavek preveri odziv in tolmači kode stanja HTTP 401 in HTTP 403 kot spodletel odgovor in vse ostale odzive kot veljavna poverila."
 );
diff --git a/apps/user_webdavauth/l10n/sr.php b/apps/user_webdavauth/l10n/sr.php
index 518fcbe9be5..44ff078493c 100644
--- a/apps/user_webdavauth/l10n/sr.php
+++ b/apps/user_webdavauth/l10n/sr.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV провера идентитета",
-"URL: http://" => "Адреса: http://",
 "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 ће послати акредитиве корисника на ову адресу. Овај прикључак проверава одговор и тумачи HTTP статусне кодове 401 и 403 као неисправне акредитиве, а све остале одговоре као исправне."
 );
diff --git a/apps/user_webdavauth/l10n/sv.php b/apps/user_webdavauth/l10n/sv.php
index c79b35c27cd..481b7710946 100644
--- a/apps/user_webdavauth/l10n/sv.php
+++ b/apps/user_webdavauth/l10n/sv.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV Autentisering",
-"URL: http://" => "URL: http://",
+"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 kommer skicka användaruppgifterna till denna URL. Denna plugin kontrollerar svaret och tolkar HTTP-statuskoderna 401 och 403 som felaktiga uppgifter, och alla andra svar som giltiga uppgifter."
 );
diff --git a/apps/user_webdavauth/l10n/th_TH.php b/apps/user_webdavauth/l10n/th_TH.php
index 2bd1f685e65..3c84ef7104d 100644
--- a/apps/user_webdavauth/l10n/th_TH.php
+++ b/apps/user_webdavauth/l10n/th_TH.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV Authentication",
-"URL: http://" => "URL: http://",
 "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 ดังกล่าวนี้ ปลั๊กอินดังกล่าวจะทำการตรวจสอบข้อมูลที่โต้ตอบกลับมาและจะทำการแปลรหัส HTTP statuscodes 401 และ 403 ให้เป็นข้อมูลการเข้าใช้งานที่ไม่สามารถใช้งานได้ ส่วนข้อมูลอื่นๆที่เหลือทั้งหมดจะเป็นข้อมูลการเข้าใช้งานที่สามารถใช้งานได้"
 );
diff --git a/apps/user_webdavauth/l10n/tr.php b/apps/user_webdavauth/l10n/tr.php
index c495a39dce5..06bf97c4b03 100644
--- a/apps/user_webdavauth/l10n/tr.php
+++ b/apps/user_webdavauth/l10n/tr.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV Kimlik doğrulaması",
-"URL: http://" => "URL: http://",
 "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 deneyme kullanicin URLe gonderecek. Bu toplan cepaplama muayene edecek ve status kodeci HTTPden 401 ve 403 deneyi  gecerli ve hepsi baska cevaplamari mantekli gibi yorumlacak. "
 );
diff --git a/apps/user_webdavauth/l10n/ug.php b/apps/user_webdavauth/l10n/ug.php
index 03ced5f4aa2..7231d0c5708 100644
--- a/apps/user_webdavauth/l10n/ug.php
+++ b/apps/user_webdavauth/l10n/ug.php
@@ -1,4 +1,3 @@
 <?php $TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV سالاھىيەت دەلىللەش",
-"URL: http://" => "URL: http://"
+"WebDAV Authentication" => "WebDAV سالاھىيەت دەلىللەش"
 );
diff --git a/apps/user_webdavauth/l10n/uk.php b/apps/user_webdavauth/l10n/uk.php
index 66887df54b5..2f4d3c95da3 100644
--- a/apps/user_webdavauth/l10n/uk.php
+++ b/apps/user_webdavauth/l10n/uk.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Аутентифікація WebDAV",
-"URL: http://" => "URL: http://",
 "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. Цей плагін перевірить відповідь і буде інтерпретувати HTTP коди 401 і 403 як повідомлення про недійсні повноваження, а решту відповідей як дійсні облікові дані."
 );
diff --git a/apps/user_webdavauth/l10n/vi.php b/apps/user_webdavauth/l10n/vi.php
index ee2aa089125..53f1e1c4209 100644
--- a/apps/user_webdavauth/l10n/vi.php
+++ b/apps/user_webdavauth/l10n/vi.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Xác thực WebDAV",
-"URL: http://" => "URL: http://",
 "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 sẽ gửi chứng thư người dùng tới URL này. Tính năng này kiểm tra trả lời và sẽ hiểu mã 401 và 403 của giao thức HTTP là chứng thư không hợp lệ, và mọi trả lời khác được coi là hợp lệ."
 );
diff --git a/apps/user_webdavauth/l10n/zh_CN.php b/apps/user_webdavauth/l10n/zh_CN.php
index 72d2a0c11df..5a935f17125 100644
--- a/apps/user_webdavauth/l10n/zh_CN.php
+++ b/apps/user_webdavauth/l10n/zh_CN.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV 认证",
-"URL: http://" => "URL：http://",
 "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。这个插件检查返回值并且将 HTTP 状态编码 401 和 403 解释为非法身份，其他所有返回值为合法身份。"
 );
diff --git a/apps/user_webdavauth/l10n/zh_TW.php b/apps/user_webdavauth/l10n/zh_TW.php
index 6f94b77ac57..32166b04751 100644
--- a/apps/user_webdavauth/l10n/zh_TW.php
+++ b/apps/user_webdavauth/l10n/zh_TW.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV 認證",
-"URL: http://" => "網址：http://",
 "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 會將把用戶的登入資訊發送到這個網址以嘗試登入，並檢查回應， HTTP 狀態碼401和403視為登入失敗，所有其他回應視為登入成功。"
 );
diff --git a/apps/user_webdavauth/templates/settings.php b/apps/user_webdavauth/templates/settings.php
index ec6524ee4f7..e199c32675c 100755
--- a/apps/user_webdavauth/templates/settings.php
+++ b/apps/user_webdavauth/templates/settings.php
@@ -1,7 +1,7 @@
 <form id="webdavauth" action="#" method="post">
 	<fieldset class="personalblock">
 		<legend><strong><?php p($l->t('WebDAV Authentication'));?></strong></legend>
-		<p><label for="webdav_url"><?php p($l->t('URL: http://'));?><input type="text" id="webdav_url" name="webdav_url" value="<?php p($_['webdav_url']); ?>"></label>
+		<p><label for="webdav_url"><?php p($l->t('URL: '));?><input type="url" placeholder="https://example.com/webdav" id="webdav_url" name="webdav_url" value="<?php p($_['webdav_url']); ?>"></label>
 		 <input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" id="requesttoken">
 		<input type="submit" value="Save" />
 		<br /><?php p($l->t('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.')); ?>
diff --git a/apps/user_webdavauth/user_webdavauth.php b/apps/user_webdavauth/user_webdavauth.php
index 6417e45434d..146034a5d43 100755
--- a/apps/user_webdavauth/user_webdavauth.php
+++ b/apps/user_webdavauth/user_webdavauth.php
@@ -41,10 +41,16 @@ class OC_USER_WEBDAVAUTH extends OC_User_Backend {
 	}
 
 	public function checkPassword( $uid, $password ) {
-		$url= 'http://'.urlencode($uid).':'.urlencode($password).'@'.$this->webdavauth_url;
+		$arr = explode('://', $this->webdavauth_url, 2);
+		if( ! isset($arr) OR count($arr) !== 2) {
+			OC_Log::write('OC_USER_WEBDAVAUTH', 'Invalid Url: "'.$this->webdavauth_url.'" ', 3);
+			return false;
+		}
+		list($webdavauth_protocol, $webdavauth_url_path) = $arr;
+		$url= $webdavauth_protocol.'://'.urlencode($uid).':'.urlencode($password).'@'.$webdavauth_url_path;
 		$headers = get_headers($url);
 		if($headers==false) {
-			OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to connect to WebDAV Url: "'.$this->webdavauth_url.'" ', 3);
+			OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to connect to WebDAV Url: "'.$webdavauth_protocol.'://'.$webdavauth_url_path.'" ', 3);
 			return false;
 
 		}
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 5854b65aa03..bdcb61284ec 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -94,23 +94,28 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 			$l = OC_L10N::get('core');
 
 			// setup the email
-			$subject = (string)$l->t('User %s shared a file with you', $displayName);
-			if ($type === 'folder')
-				$subject = (string)$l->t('User %s shared a folder with you', $displayName);
+			$subject = (string)$l->t('%s shared »%s« with you', array($displayName, $file));
 
-			$text = (string)$l->t('User %s shared the file "%s" with you. It is available for download here: %s',
-				array($displayName, $file, $link));
-			if ($type === 'folder')
-				$text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s',
-					array($displayName, $file, $link));
+			$content = new OC_Template("core", "mail", "");
+			$content->assign ('link', $link);
+			$content->assign ('type', $type);
+			$content->assign ('user_displayname', $displayName);
+			$content->assign ('filename', $file);
+			$text = $content->fetchPage();
 
+			$content = new OC_Template("core", "altmail", "");
+			$content->assign ('link', $link);
+			$content->assign ('type', $type);
+			$content->assign ('user_displayname', $displayName);
+			$content->assign ('filename', $file);
+			$alttext = $content->fetchPage();
 
 			$default_from = OCP\Util::getDefaultEmailAddress('sharing-noreply');
 			$from_address = OCP\Config::getUserValue($user, 'settings', 'email', $default_from );
 
 			// send it out now
 			try {
-				OCP\Util::sendMail($to_address, $to_address, $subject, $text, $from_address, $displayName);
+				OCP\Util::sendMail($to_address, $to_address, $subject, $text, $from_address, $displayName, 1, $alttext);
 				OCP\JSON::success();
 			} catch (Exception $exception) {
 				OCP\JSON::error(array('data' => array('message' => OC_Util::sanitizeHTML($exception->getMessage()))));
diff --git a/core/ajax/update.php b/core/ajax/update.php
index 6015a901eb7..db00da02239 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -5,11 +5,15 @@ require_once '../../lib/base.php';
 
 if (OC::checkUpgrade(false)) {
 	\OC_DB::enableCaching(false);
+	OC_Config::setValue('maintenance', true);
+	$installedVersion = OC_Config::getValue('version', '0.0.0');
+	$currentVersion = implode('.', OC_Util::getVersion());
+	OC_Log::write('core', 'starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, OC_Log::WARN);
 	$updateEventSource = new OC_EventSource();
 	$watcher = new UpdateWatcher($updateEventSource);
 	OC_Hook::connect('update', 'success', $watcher, 'success');
 	OC_Hook::connect('update', 'error', $watcher, 'error');
-	OC_Hook::connect('update', 'error', $watcher, 'failure');
+	OC_Hook::connect('update', 'failure', $watcher, 'failure');
 	$watcher->success('Turned on maintenance mode');
 	try {
 		$result = OC_DB::updateDbFromStructure(OC::$SERVERROOT.'/db_structure.xml');
@@ -99,6 +103,7 @@ class UpdateWatcher {
 		OC_Util::obEnd();
 		$this->eventSource->send('failure', $message);
 		$this->eventSource->close();
+		OC_Config::setValue('maintenance', false);
 		die();
 	}
 
@@ -108,4 +113,4 @@ class UpdateWatcher {
 		$this->eventSource->close();
 	}
 
-}
+}
\ No newline at end of file
diff --git a/core/css/multiselect.css b/core/css/multiselect.css
index def4e60d74d..a2d1b20d3a5 100644
--- a/core/css/multiselect.css
+++ b/core/css/multiselect.css
@@ -1,84 +1,105 @@
-/* Copyright (c) 2011, Jan-Christoph Borchardt, http://jancborchardt.net
- This file is licensed under the Affero General Public License version 3 or later.
- See the COPYING-README file. */
+/* Copyright (c) 2011, Jan-Christoph Borchardt, http: //jancborchardt.net
+This file is licensed under the Affero General Public License version 3 or later.
+See the COPYING-README file. */
 
- ul.multiselectoptions {
- 	background-color:#fff;
- 	border:1px solid #ddd;
- 	border-top:none;
- 	box-shadow:0 1px 1px #ddd;
- 	padding-top:.5em;
- 	position:absolute;
-	max-height: 20em;
-	overflow-y: auto;
- 	z-index:49;
- }
+ul.multiselectoptions {
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-top: none;
+	box-shadow: 0 1px 1px #ddd;
+	padding-top: .5em;
+	position: absolute;
+	max-height:  20em;
+	overflow-y:  auto;
+	z-index: 49;
+}
 
- ul.multiselectoptions.down {
- 	border-bottom-left-radius:.5em;
- 	border-bottom-right-radius:.5em;
- }
+ul.multiselectoptions.down {
+	border-bottom-left-radius: .5em;
+	border-bottom-right-radius: .5em;
+	width: 100%; /* do not cut off group names */
+	-webkit-box-shadow: 0px 0px 20px rgba(29,45,68,.4);
+	-moz-box-shadow: 0px 0px 20px rgba(29,45,68,.4);
+	box-shadow: 0px 0px 20px rgba(29,45,68,.4);
+}
 
- ul.multiselectoptions.up {
- 	border-top-left-radius:.5em;
- 	border-top-right-radius:.5em;
- }
+ul.multiselectoptions.up {
+	border-top-left-radius: .5em;
+	border-top-right-radius: .5em;
+}
 
- ul.multiselectoptions>li {
- 	overflow:hidden;
- 	white-space:nowrap;
- }
+ul.multiselectoptions>li {
+	overflow: hidden;
+	white-space: nowrap;
+}
 
- ul.multiselectoptions>li>input[type="checkbox"] {
-	margin-top: 3px;
-	margin-right: 5px;
-	margin-left: 3px;
- }
+ul.multiselectoptions > li > input[type="checkbox"] {
+	margin: 10px 7px;
+	vertical-align: middle;
+}
+ul.multiselectoptions > li input[type='checkbox']+label {
+	font-weight: normal;
+	display: inline-block;
+	width: 100%;
+	padding: 5px 27px;
+	margin-left: -27px; /* to have area around checkbox clickable as well */
+}
+ul.multiselectoptions > li input[type='checkbox']:checked+label {
+	font-weight: bold;
+}
 
- div.multiselect {
- 	display:inline-block;
- 	max-width:400px;
- 	min-width:100px;
- 	padding-right:.6em;
- 	position:relative;
- 	vertical-align:bottom;
- }
+div.multiselect {
+	display: inline-block;
+	max-width: 400px;
+	min-width: 150px;
+	padding-right: .6em;
+	position: relative;
+	vertical-align: bottom;
+}
 
- div.multiselect.active {
- 	background-color:#fff;
- 	position:relative;
- 	z-index:50;
- }
+div.multiselect.active {
+	background-color: #fff;
+	position: relative;
+	z-index: 50;
+}
 
- div.multiselect.up {
- 	border-top:0 none;
- 	border-top-left-radius:0;
- 	border-top-right-radius:0;
- }
+div.multiselect.up {
+	border-top: 0 none;
+	border-top-left-radius: 0;
+	border-top-right-radius: 0;
+}
 
- div.multiselect.down {
- 	border-bottom:none;
- 	border-bottom-left-radius:0;
- 	border-bottom-right-radius:0;
- }
+div.multiselect.down {
+	border-bottom: none;
+	border-bottom-left-radius: 0;
+	border-bottom-right-radius: 0;
+}
 
- div.multiselect>span:first-child {
- 	float:left;
- 	margin-right:2em;
- 	overflow:hidden;
- 	text-overflow:ellipsis;
- 	width:90%;
- }
+div.multiselect>span:first-child {
+	float: left;
+	margin-right: 2em;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	width: 90%;
+}
 
- div.multiselect>span:last-child {
- 	position:absolute;
- 	right:.8em;
- }
+div.multiselect>span:last-child {
+	position: absolute;
+	right: .8em;
+}
 
- ul.multiselectoptions input.new {
- 	border-top-left-radius:0;
- 	border-top-right-radius:0;
- 	padding-bottom:.2em;
- 	padding-top:.2em;
- 	margin:0;
- }
+ul.multiselectoptions input.new {
+	padding-bottom: .2em;
+	padding-top: .2em;
+	margin: 0;
+}
+
+ul.multiselectoptions > li.creator {
+	padding: 10px;
+	font-weight: bold;
+}
+ul.multiselectoptions > li.creator > input {
+	width: 95% !important; /* do not constrain size of text input */
+	padding: 5px;
+	margin: -5px;
+}
diff --git a/core/css/styles.css b/core/css/styles.css
index 313f89195df..40a17a42876 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -141,7 +141,7 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 	padding:0 70px 0 0.5em; margin:0;
 	-moz-box-sizing:border-box; box-sizing:border-box;
 	-moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000;
-	background:#f7f7f7; border-bottom:1px solid #eee;  z-index:50;
+	background:#eee; border-bottom:1px solid #e7e7e7; z-index:50;
 }
 #controls .button { display:inline-block; }
 
@@ -355,14 +355,27 @@ tr .action { width:16px; height:16px; }
 tr:hover .action:hover, .selectedActions a:hover, .header-action:hover { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
 tbody tr:hover, tr:active { background-color:#f8f8f8; }
 
-#body-settings .personalblock, #body-settings .helpblock { padding:.5em 1em; margin:1em; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
+#body-settings .personalblock, #body-settings .helpblock {
+	padding: .5em 1em;
+	margin: 1em;
+	background-color: rgb(240,240,240);
+	color: #555;
+	text-shadow: #fff 0 1px 0;
+	-moz-border-radius: .5em; -webkit-border-radius: .5em; border-radius: .5em;
+}
 #body-settings .personalblock#quota { position:relative; padding:0; }
 #body-settings #controls+.helpblock { position:relative; margin-top:3em; }
 .personalblock > legend { margin-top:2em; }
 .personalblock > legend, th, dt, label { font-weight:bold; }
 code { font-family:"Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", monospace; }
 
-#quota div, div.jp-play-bar, div.jp-seek-bar { padding:0; background:#e6e6e6; font-weight:normal; white-space:nowrap; -moz-border-radius-bottomleft:.4em; -webkit-border-bottom-left-radius:.4em; border-bottom-left-radius:.4em; -moz-border-radius-topleft:.4em; -webkit-border-top-left-radius:.4em; border-top-left-radius:.4em; }
+#quota div, div.jp-play-bar, div.jp-seek-bar {
+	padding: 0;
+	background-color: rgb(220,220,220);
+	font-weight: normal;
+	white-space: nowrap;
+	-moz-border-radius-bottomleft: .4em; -webkit-border-bottom-left-radius: .4em; border-bottom-left-radius:.4em;
+	-moz-border-radius-topleft: .4em; -webkit-border-top-left-radius: .4em; border-top-left-radius: .4em; }
 #quotatext {padding:.6em 1em;}
 div.jp-play-bar, div.jp-seek-bar { padding:0; }
 
@@ -427,12 +440,22 @@ span.ui-icon {float: left; margin: 3px 7px 30px 0;}
 .help-includes {overflow: hidden; width: 100%; height: 100%; -moz-box-sizing: border-box;	box-sizing: border-box;	padding-top: 2.8em; }
 .help-iframe {width: 100%; height: 100%; margin: 0;padding: 0; border: 0; overflow: auto;}
 
+
 /* ---- BREADCRUMB ---- */
 div.crumb { float:left; display:block; background:url('../img/breadcrumb.svg') no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em;  -moz-box-sizing:border-box; box-sizing:border-box; }
 div.crumb:first-child { padding:10px 20px 10px 5px; }
 div.crumb.last { font-weight:bold; background:none; padding-right:10px; }
 div.crumb a{ padding: 0.9em 0 0.7em 0; }
 
+/* some feedback for hover/tap on breadcrumbs */
+div.crumb:hover,
+div.crumb:focus,
+div.crumb:active {
+	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
+	filter:alpha(opacity=70);
+	opacity:.7;
+}
+
 
 
 /* ---- APP STYLING ---- */
@@ -641,3 +664,10 @@ button.loading {
 	background-position: right 10px center; background-repeat: no-repeat;
 	padding-right: 30px;
 }
+
+
+
+/* ---- BROWSER-SPECIFIC FIXES ---- */
+::-moz-focus-inner {
+	border: 0; /* remove dotted outlines in Firefox */
+}
diff --git a/core/img/logo-mail.gif b/core/img/logo-mail.gif
new file mode 100644
index 00000000000..6a1caaa9188
--- /dev/null
+++ b/core/img/logo-mail.gif
diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index 463c397d8cd..48d521e1856 100644
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@@ -176,10 +176,10 @@
 			});
 			button.parent().data('preventHide',false);
 			if(settings.createText){
-				var li=$('<li class="creator">+ <em>'+settings.createText+'<em></li>');
+				var li=$('<li class="creator">+ '+settings.createText+'</li>');
 				li.click(function(event){
 					li.empty();
-					var input=$('<input class="new">');
+					var input=$('<input type="text" class="new">');
 					li.append(input);
 					input.focus();
 					input.css('width',button.innerWidth());
diff --git a/core/l10n/af_ZA.php b/core/l10n/af_ZA.php
index f5f27d2af58..4878c75edde 100644
--- a/core/l10n/af_ZA.php
+++ b/core/l10n/af_ZA.php
@@ -15,6 +15,7 @@
 "Admin" => "Admin",
 "Help" => "Hulp",
 "Cloud not found" => "Wolk nie gevind",
+"web services under your control" => "webdienste onder jou beheer",
 "Create an <strong>admin account</strong>" => "Skep `n <strong>admin-rekening</strong>",
 "Advanced" => "Gevorderd",
 "Configure the database" => "Stel databasis op",
@@ -23,7 +24,6 @@
 "Database password" => "Databasis-wagwoord",
 "Database name" => "Databasis naam",
 "Finish setup" => "Maak opstelling klaar",
-"web services under your control" => "webdienste onder jou beheer",
 "Log out" => "Teken uit",
 "Lost your password?" => "Jou wagwoord verloor?",
 "remember" => "onthou",
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 8bd4429338a..7ac7a564c35 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "المستخدم %s قام بمشاركة ملف معك",
-"User %s shared a folder with you" => "المستخدم  %s قام بمشاركة مجلد معك",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "المستخدم  %s  قام بمشاركة الملف  \"%s\"  معك . الملف متاح للتحميل من هنا : %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "المستخدم  %s  قام بمشاركة المجلد  \"%s\"  معك . المجلد متاح للتحميل من هنا : %s",
 "Category type not provided." => "نوع التصنيف لم يدخل",
 "No category to add?" => "ألا توجد فئة للإضافة؟",
 "This category already exists: %s" => "هذا التصنيف موجود مسبقا :  %s",
@@ -102,6 +98,7 @@
 "Help" => "المساعدة",
 "Access forbidden" => "التوصّل محظور",
 "Cloud not found" => "لم يتم إيجاد",
+"web services under your control" => "خدمات الشبكة تحت سيطرتك",
 "Edit categories" => "عدل الفئات",
 "Add" => "اضف",
 "Security Warning" => "تحذير أمان",
@@ -122,7 +119,6 @@
 "Database tablespace" => "مساحة جدول قاعدة البيانات",
 "Database host" => "خادم قاعدة البيانات",
 "Finish setup" => "انهاء التعديلات",
-"web services under your control" => "خدمات الشبكة تحت سيطرتك",
 "Log out" => "الخروج",
 "Automatic logon rejected!" => "تم رفض تسجيل الدخول التلقائي!",
 "If you did not change your password recently, your account may be compromised!" => "قد يكون حسابك في خطر إن لم تقم بإعادة تعيين كلمة السر حديثاً",
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 6c04907e15b..490bea9b170 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -50,6 +50,7 @@
 "Help" => "Помощ",
 "Access forbidden" => "Достъпът е забранен",
 "Cloud not found" => "облакът не намерен",
+"web services under your control" => "уеб услуги под Ваш контрол",
 "Edit categories" => "Редактиране на категориите",
 "Add" => "Добавяне",
 "Create an <strong>admin account</strong>" => "Създаване на <strong>админ профил</strong>",
@@ -62,7 +63,6 @@
 "Database name" => "Име на базата",
 "Database host" => "Хост за базата",
 "Finish setup" => "Завършване на настройките",
-"web services under your control" => "уеб услуги под Ваш контрол",
 "Log out" => "Изход",
 "Lost your password?" => "Забравена парола?",
 "remember" => "запомни",
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index 218bbce04aa..c775d2fb6af 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "%s নামের ব্যবহারকারি আপনার সাথে একটা ফাইল ভাগাভাগি করেছেন",
-"User %s shared a folder with you" => "%s নামের ব্যবহারকারি আপনার সাথে একটা ফোল্ডার ভাগাভাগি করেছেন",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s নামের ব্যবহারকারী \"%s\" ফাইলটি আপনার সাথে ভাগাভাগি করেছেন। এটি এখন এখানে ডাউনলোড করার জন্য সুলভঃ %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s নামের ব্যবহারকারী \"%s\" ফোল্ডারটি আপনার সাথে ভাগাভাগি করেছেন। এটি এখন এখানে ডাউনলোড করার জন্য সুলভঃ %s",
 "Category type not provided." => "ক্যাটেগরির ধরণটি প্রদান করা হয় নি।",
 "No category to add?" => "যোগ করার মত কোন ক্যাটেগরি নেই ?",
 "Object type not provided." => "অবজেক্টের ধরণটি প্রদান করা হয় নি।",
@@ -99,6 +95,7 @@
 "Help" => "সহায়িকা",
 "Access forbidden" => "অধিগমনের অনুমতি নেই",
 "Cloud not found" => "ক্লাউড খুঁজে পাওয়া গেল না",
+"web services under your control" => "ওয়েব সার্ভিস আপনার হাতের মুঠোয়",
 "Edit categories" => "ক্যাটেগরি সম্পাদনা",
 "Add" => "যোগ কর",
 "Security Warning" => "নিরাপত্তাজনিত সতর্কতা",
@@ -113,7 +110,6 @@
 "Database tablespace" => "ডাটাবেজ টেবলস্পেস",
 "Database host" => "ডাটাবেজ হোস্ট",
 "Finish setup" => "সেটআপ সুসম্পন্ন কর",
-"web services under your control" => "ওয়েব সার্ভিস আপনার হাতের মুঠোয়",
 "Log out" => "প্রস্থান",
 "Lost your password?" => "কূটশব্দ হারিয়েছেন?",
 "remember" => "মনে রাখ",
diff --git a/core/l10n/bs.php b/core/l10n/bs.php
new file mode 100644
index 00000000000..6b65cf81f28
--- /dev/null
+++ b/core/l10n/bs.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Share" => "Podijeli",
+"Add" => "Dodaj"
+);
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index dad970d4179..67cf0aca9d6 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "L'usuari %s ha compartit un fitxer amb vós",
-"User %s shared a folder with you" => "L'usuari %s ha compartit una carpeta amb vós",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "L'usuari %s ha compartit el fitxer \"%s\" amb vós. Està disponible per a la descàrrega a: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "L'usuari %s ha compartit la carpeta \"%s\" amb vós. Està disponible per a la descàrrega a: %s",
+"%s shared »%s« with you" => "%s ha compartit »%s« amb tu",
 "Category type not provided." => "No s'ha especificat el tipus de categoria.",
 "No category to add?" => "No voleu afegir cap categoria?",
 "This category already exists: %s" => "Aquesta categoria ja existeix: %s",
@@ -93,6 +90,8 @@
 "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?",
+"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",
 "To login page" => "A la pàgina d'inici de sessió",
@@ -105,6 +104,8 @@
 "Help" => "Ajuda",
 "Access forbidden" => "Accés prohibit",
 "Cloud not found" => "No s'ha trobat el núvol",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ei,\n\nnomés fer-te saber que %s ha compartit %s amb tu.\nMira-ho: %s\n\nSalut!",
+"web services under your control" => "controleu els vostres serveis web",
 "Edit categories" => "Edita les categories",
 "Add" => "Afegeix",
 "Security Warning" => "Avís de seguretat",
@@ -125,7 +126,6 @@
 "Database tablespace" => "Espai de taula de la base de dades",
 "Database host" => "Ordinador central de la base de dades",
 "Finish setup" => "Acaba la configuració",
-"web services under your control" => "controleu els vostres serveis web",
 "%s is available. Get more information on how to update." => "%s està disponible. Obtingueu més informació de com actualitzar.",
 "Log out" => "Surt",
 "Automatic logon rejected!" => "L'ha rebutjat l'acceditació automàtica!",
@@ -135,6 +135,7 @@
 "remember" => "recorda'm",
 "Log in" => "Inici de sessió",
 "Alternative Logins" => "Acreditacions alternatives",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ei,<br><br>només fer-te saber que %s ha compartit %s amb tu.<br><a href=\"%s\">Mira-ho:</a><br><br>Salut!",
 "prev" => "anterior",
 "next" => "següent",
 "Updating ownCloud to version %s, this may take a while." => "S'està actualitzant ownCloud a la versió %s, pot trigar una estona."
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 7a561cf0168..f3b4cd49bfe 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Uživatel %s s vámi sdílí soubor",
-"User %s shared a folder with you" => "Uživatel %s s vámi sdílí složku",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Uživatel %s s vámi sdílí soubor \"%s\". Můžete jej stáhnout zde: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uživatel %s s vámi sdílí složku \"%s\". Můžete ji stáhnout zde: %s",
+"%s shared »%s« with you" => "%s s vámi sdílí »%s«",
 "Category type not provided." => "Nezadán typ kategorie.",
 "No category to add?" => "Žádná kategorie k přidání?",
 "This category already exists: %s" => "Kategorie již existuje: %s",
@@ -93,6 +90,8 @@
 "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",
 "To login page" => "Na stránku přihlášení",
@@ -105,6 +104,8 @@
 "Help" => "Nápověda",
 "Access forbidden" => "Přístup zakázán",
 "Cloud not found" => "Cloud nebyl nalezen",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ahoj,\n\njenom vám chci oznámit že %s s vámi sdílí %s.\nPodívat se můžete zde: %s\n\nDíky",
+"web services under your control" => "služby webu pod Vaší kontrolou",
 "Edit categories" => "Upravit kategorie",
 "Add" => "Přidat",
 "Security Warning" => "Bezpečnostní upozornění",
@@ -125,7 +126,6 @@
 "Database tablespace" => "Tabulkový prostor databáze",
 "Database host" => "Hostitel databáze",
 "Finish setup" => "Dokončit nastavení",
-"web services under your control" => "služby webu pod Vaší kontrolou",
 "%s is available. Get more information on how to update." => "%s je dostupná. Získejte více informací k postupu aktualizace.",
 "Log out" => "Odhlásit se",
 "Automatic logon rejected!" => "Automatické přihlášení odmítnuto.",
@@ -135,6 +135,7 @@
 "remember" => "zapamatovat",
 "Log in" => "Přihlásit",
 "Alternative Logins" => "Alternativní přihlášení",
+"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>jenom vám chci oznámit že %s s vámi sdílí %s.\nPodívat se můžete <br><a href=\"%s\">zde</a>.<br><br>Díky",
 "prev" => "předchozí",
 "next" => "následující",
 "Updating ownCloud to version %s, this may take a while." => "Aktualizuji ownCloud na verzi %s, bude to chvíli trvat."
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
index cdb2576d457..6158a356dc7 100644
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Rhannodd defnyddiwr %s ffeil â chi",
-"User %s shared a folder with you" => "Rhannodd defnyddiwr %s blygell â chi",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Rhannodd defnyddiwr %s ffeil \"%s\" â chi. Gellir ei llwytho lawr o fan hyn: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Rhannodd defnyddiwr %s blygell \"%s\" â chi. Gellir ei llwytho lawr o fan hyn: %s",
 "Category type not provided." => "Math o gategori heb ei ddarparu.",
 "No category to add?" => "Dim categori i'w ychwanegu?",
 "This category already exists: %s" => "Mae'r categori hwn eisoes yn bodoli: %s",
@@ -104,6 +100,7 @@
 "Help" => "Cymorth",
 "Access forbidden" => "Mynediad wedi'i wahardd",
 "Cloud not found" => "Methwyd canfod cwmwl",
+"web services under your control" => "gwasanaethau gwe a reolir gennych",
 "Edit categories" => "Golygu categorïau",
 "Add" => "Ychwanegu",
 "Security Warning" => "Rhybudd Diogelwch",
@@ -124,7 +121,6 @@
 "Database tablespace" => "Tablespace cronfa ddata",
 "Database host" => "Gwesteiwr cronfa ddata",
 "Finish setup" => "Gorffen sefydlu",
-"web services under your control" => "gwasanaethau gwe a reolir gennych",
 "%s is available. Get more information on how to update." => "%s ar gael. Mwy o wybodaeth am sut i ddiweddaru.",
 "Log out" => "Allgofnodi",
 "Automatic logon rejected!" => "Gwrthodwyd mewngofnodi awtomatig!",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 4c030bbf7cc..b3da17ba798 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Bruger %s delte en fil med dig",
-"User %s shared a folder with you" => "Bruger %s delte en mappe med dig",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Bruger %s delte filen \"%s\" med dig. Den kan hentes her: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Bruger %s delte mappe \"%s\" med dig. Det kan hentes her: %s",
 "Category type not provided." => "Kategori typen ikke er fastsat.",
 "No category to add?" => "Ingen kategori at tilføje?",
 "This category already exists: %s" => "Kategorien eksisterer allerede: %s",
@@ -46,6 +42,7 @@
 "years ago" => "år siden",
 "Choose" => "Vælg",
 "Cancel" => "Annuller",
+"Error loading file picker template" => "Fejl ved indlæsning af filvælger skabelon",
 "Yes" => "Ja",
 "No" => "Nej",
 "Ok" => "OK",
@@ -104,6 +101,7 @@
 "Help" => "Hjælp",
 "Access forbidden" => "Adgang forbudt",
 "Cloud not found" => "Sky ikke fundet",
+"web services under your control" => "Webtjenester under din kontrol",
 "Edit categories" => "Rediger kategorier",
 "Add" => "Tilføj",
 "Security Warning" => "Sikkerhedsadvarsel",
@@ -124,7 +122,6 @@
 "Database tablespace" => "Database tabelplads",
 "Database host" => "Databasehost",
 "Finish setup" => "Afslut opsætning",
-"web services under your control" => "Webtjenester under din kontrol",
 "%s is available. Get more information on how to update." => "%s er tilgængelig. Få mere information om, hvordan du opdaterer.",
 "Log out" => "Log ud",
 "Automatic logon rejected!" => "Automatisk login afvist!",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index feecee81bf7..bf301b11790 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Der Nutzer %s hat eine Datei mit Dir geteilt",
-"User %s shared a folder with you" => "%s hat ein Verzeichnis mit Dir geteilt",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat die Datei \"%s\" mit Dir geteilt. Sie ist hier zum Download verfügbar: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat den Ordner \"%s\" mit Dir geteilt. Er ist hier zum Download verfügbar: %s",
 "Category type not provided." => "Kategorie nicht angegeben.",
 "No category to add?" => "Keine Kategorie hinzuzufügen?",
 "This category already exists: %s" => "Die Kategorie '%s' existiert bereits.",
@@ -105,6 +101,7 @@
 "Help" => "Hilfe",
 "Access forbidden" => "Zugriff verboten",
 "Cloud not found" => "Cloud nicht gefunden",
+"web services under your control" => "Web-Services unter Deiner Kontrolle",
 "Edit categories" => "Kategorien bearbeiten",
 "Add" => "Hinzufügen",
 "Security Warning" => "Sicherheitswarnung",
@@ -125,7 +122,6 @@
 "Database tablespace" => "Datenbank-Tablespace",
 "Database host" => "Datenbank-Host",
 "Finish setup" => "Installation abschließen",
-"web services under your control" => "Web-Services unter Deiner Kontrolle",
 "%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
 "Log out" => "Abmelden",
 "Automatic logon rejected!" => "Automatischer Login zurückgewiesen!",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index ea8a4e5adc3..fb7835eba26 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Der Nutzer %s hat eine Datei mit Ihnen geteilt",
-"User %s shared a folder with you" => "%s hat einen Ordner mit Ihnen geteilt",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s hat die Datei \"%s\" mit Ihnen geteilt. Sie ist hier zum Download verfügbar: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s hat den Ordner \"%s\" mit Ihnen geteilt. Er ist hier zum Download verfügbar: %s",
 "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",
@@ -105,6 +101,7 @@
 "Help" => "Hilfe",
 "Access forbidden" => "Zugriff verboten",
 "Cloud not found" => "Cloud wurde nicht gefunden",
+"web services under your control" => "Web-Services unter Ihrer Kontrolle",
 "Edit categories" => "Kategorien ändern",
 "Add" => "Hinzufügen",
 "Security Warning" => "Sicherheitshinweis",
@@ -125,7 +122,6 @@
 "Database tablespace" => "Datenbank-Tablespace",
 "Database host" => "Datenbank-Host",
 "Finish setup" => "Installation abschließen",
-"web services under your control" => "Web-Services unter Ihrer Kontrolle",
 "%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
 "Log out" => "Abmelden",
 "Automatic logon rejected!" => "Automatische Anmeldung verweigert!",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 11295105e31..6b1239fe45c 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Ο χρήστης %s διαμοιράστηκε ένα αρχείο με εσάς",
-"User %s shared a folder with you" => "Ο χρήστης %s διαμοιράστηκε ένα φάκελο με εσάς",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Ο χρήστης %s διαμοιράστηκε το αρχείο \"%s\" μαζί σας. Είναι διαθέσιμο για λήψη εδώ: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Ο χρήστης %s διαμοιράστηκε τον φάκελο \"%s\" μαζί σας. Είναι διαθέσιμος για λήψη εδώ: %s",
 "Category type not provided." => "Δεν δώθηκε τύπος κατηγορίας.",
 "No category to add?" => "Δεν έχετε κατηγορία να προσθέσετε;",
 "This category already exists: %s" => "Αυτή η κατηγορία υπάρχει ήδη: %s",
@@ -104,6 +100,7 @@
 "Help" => "Βοήθεια",
 "Access forbidden" => "Δεν επιτρέπεται η πρόσβαση",
 "Cloud not found" => "Δεν βρέθηκε νέφος",
+"web services under your control" => "υπηρεσίες δικτύου υπό τον έλεγχό σας",
 "Edit categories" => "Επεξεργασία κατηγοριών",
 "Add" => "Προσθήκη",
 "Security Warning" => "Προειδοποίηση Ασφαλείας",
@@ -124,7 +121,7 @@
 "Database tablespace" => "Κενά Πινάκων Βάσης Δεδομένων",
 "Database host" => "Διακομιστής βάσης δεδομένων",
 "Finish setup" => "Ολοκλήρωση εγκατάστασης",
-"web services under your control" => "υπηρεσίες δικτύου υπό τον έλεγχό σας",
+"%s is available. Get more information on how to update." => "%s είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες στο πώς να αναβαθμίσετε.",
 "Log out" => "Αποσύνδεση",
 "Automatic logon rejected!" => "Απορρίφθηκε η αυτόματη σύνδεση!",
 "If you did not change your password recently, your account may be compromised!" => "Εάν δεν αλλάξατε το συνθηματικό σας προσφάτως, ο λογαριασμός μπορεί να έχει διαρρεύσει!",
diff --git a/core/l10n/en@pirate.php b/core/l10n/en@pirate.php
index 981d9a1ca0f..0c590d0b758 100644
--- a/core/l10n/en@pirate.php
+++ b/core/l10n/en@pirate.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "User %s shared a file with you",
 "Password" => "Passcode",
 "web services under your control" => "web services under your control"
 );
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index af1a39ce2ec..c647850d0cb 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "La uzanto %s kunhavigis dosieron kun vi",
-"User %s shared a folder with you" => "La uzanto %s kunhavigis dosierujon kun vi",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "La uzanto %s kunhavigis la dosieron “%s” kun vi. Ĝi elŝuteblas el tie ĉi: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "La uzanto %s kunhavigis la dosierujon “%s” kun vi. Ĝi elŝuteblas el tie ĉi: %s",
 "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",
@@ -102,6 +98,7 @@
 "Help" => "Helpo",
 "Access forbidden" => "Aliro estas malpermesata",
 "Cloud not found" => "La nubo ne estas trovita",
+"web services under your control" => "TTT-servoj regataj de vi",
 "Edit categories" => "Redakti kategoriojn",
 "Add" => "Aldoni",
 "Security Warning" => "Sekureca averto",
@@ -118,7 +115,6 @@
 "Database tablespace" => "Datumbaza tabelospaco",
 "Database host" => "Datumbaza gastigo",
 "Finish setup" => "Fini la instalon",
-"web services under your control" => "TTT-servoj regataj de vi",
 "Log out" => "Elsaluti",
 "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.",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 4b8d5c7b189..93d644c01ed 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -1,14 +1,11 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "El usuario %s ha compartido un archivo contigo.",
-"User %s shared a folder with you" => "El usuario %s ha compartido una carpeta contigo.",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "El usuario %s ha compartido el archivo \"%s\" contigo. Puedes descargarlo aquí: %s.",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "El usuario %s ha compartido la carpeta \"%s\" contigo. Puedes descargarla aquí: %s.",
+"%s shared »%s« with you" => "%s compatido  »%s« contigo",
 "Category type not provided." => "Tipo de categoría no proporcionado.",
 "No category to add?" => "¿Ninguna categoría para añadir?",
-"This category already exists: %s" => "Ya existe esta categoría: %s",
+"This category already exists: %s" => "Esta categoría ya existe: %s",
 "Object type not provided." => "Tipo de objeto no proporcionado.",
 "%s ID not provided." => "ID de %s no proporcionado.",
-"Error adding %s to favorites." => "Error añadiendo %s a los favoritos.",
+"Error adding %s to favorites." => "Error añadiendo %s a favoritos.",
 "No categories selected for deletion." => "No hay categorías seleccionadas para borrar.",
 "Error removing %s from favorites." => "Error eliminando %s de los favoritos.",
 "Sunday" => "Domingo",
@@ -50,9 +47,9 @@
 "Yes" => "Sí",
 "No" => "No",
 "Ok" => "Aceptar",
-"The object type is not specified." => "No se ha especificado el tipo de objeto",
+"The object type is not specified." => "El tipo de objeto no está especificado.",
 "Error" => "Error",
-"The app name is not specified." => "No se ha especificado el nombre de la aplicación.",
+"The app name is not specified." => "El nombre de la aplicación no está especificado.",
 "The required file {file} is not installed!" => "¡El fichero requerido {file} no está instalado!",
 "Shared" => "Compartido",
 "Share" => "Compartir",
@@ -86,13 +83,15 @@
 "Sending ..." => "Enviando...",
 "Email sent" => "Correo electrónico enviado",
 "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 ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</ a>.",
-"The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado correctamente. Redireccionando a ownCloud ahora.",
-"ownCloud password reset" => "Restablecer contraseña de ownCloud",
-"Use the following link to reset your password: {link}" => "Utiliza el siguiente enlace para restablecer tu contraseña: {link}",
+"The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
+"ownCloud password reset" => "Reseteo contraseña de ownCloud",
+"Use the following link to reset your password: {link}" => "Utilice el siguiente 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 ha sido enviada a su correo electrónico. <br> Si no lo recibe en un plazo razonable de tiempo, revise su carpeta de spam / correo no deseado. <br> Si no está allí, pregunte a su administrador local.",
 "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?",
+"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",
 "To login page" => "A la página de inicio de sesión",
@@ -103,20 +102,22 @@
 "Apps" => "Aplicaciones",
 "Admin" => "Administración",
 "Help" => "Ayuda",
-"Access forbidden" => "Acceso denegado",
-"Cloud not found" => "No se ha encontrado la nube",
+"Access forbidden" => "Acceso prohibido",
+"Cloud not found" => "No se ha encuentra la nube",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Oye,⏎ sólo te hago saber que %s compartido %s contigo.⏎ Míralo: %s ⏎Disfrutalo!",
+"web services under your control" => "Servicios web bajo su control",
 "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 es vulnerable al ataque de Byte NULL (CVE-2006-7243)",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Su versión de PHP es vulnerable al ataque de Byte NULL (CVE-2006-7243)",
 "Please update your PHP installation to use ownCloud securely." => "Por favor, actualice su instalación de PHP para utilizar ownCloud de manera segura.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "No está disponible un generador de números aleatorios seguro, por favor habilite 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 restablecimiento de contraseñas y tomar el control de su cuenta.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Probablemente su directorio de datos y sus archivos sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
 "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 su servidor, por favor vea 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",
+"Data folder" => "Directorio de datos",
 "Configure the database" => "Configurar la base de datos",
 "will be used" => "se utilizarán",
 "Database user" => "Usuario de la base de datos",
@@ -125,16 +126,16 @@
 "Database tablespace" => "Espacio de tablas de la base de datos",
 "Database host" => "Host de la base de datos",
 "Finish setup" => "Completar la instalación",
-"web services under your control" => "Servicios web bajo su control",
 "%s is available. Get more information on how to update." => "%s esta disponible. Obtener mas información de como actualizar.",
 "Log out" => "Salir",
 "Automatic logon rejected!" => "¡Inicio de sesión automático rechazado!",
 "If you did not change your password recently, your account may be compromised!" => "Si usted no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!",
 "Please change your password to secure your account again." => "Por favor cambie su contraseña para asegurar su cuenta nuevamente.",
 "Lost your password?" => "¿Ha perdido su contraseña?",
-"remember" => "recordarme",
+"remember" => "recordar",
 "Log in" => "Entrar",
-"Alternative Logins" => "Nombre de usuarios alternativos",
+"Alternative Logins" => "Inicios de sesión 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!" => "Oye,<br><br>sólo te hago saber que %s compartido %s contigo,<br><a href=\"%s\">\nMíralo!</a><br><br>Disfrutalo!",
 "prev" => "anterior",
 "next" => "siguiente",
 "Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo."
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 38b0791b94b..24e5a41fd0d 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "El usurario %s compartió un archivo con vos.",
-"User %s shared a folder with you" => "El usurario %s compartió una carpeta con vos.",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "El usuario %s compartió el archivo \"%s\" con vos. Está disponible para su descarga aquí: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "El usuario %s compartió el archivo \"%s\" con vos. Está disponible para su descarga aquí: %s",
 "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",
@@ -46,6 +42,7 @@
 "years ago" => "años atrás",
 "Choose" => "Elegir",
 "Cancel" => "Cancelar",
+"Error loading file picker template" => "Error al cargar la plantilla del seleccionador de archivos",
 "Yes" => "Sí",
 "No" => "No",
 "Ok" => "Aceptar",
@@ -88,6 +85,8 @@
 "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.",
+"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",
 "Username" => "Nombre de usuario",
 "Request reset" => "Solicitar restablecimiento",
@@ -102,6 +101,7 @@
 "Help" => "Ayuda",
 "Access forbidden" => "Acceso denegado",
 "Cloud not found" => "No se encontró ownCloud",
+"web services under your control" => "servicios web controlados por vos",
 "Edit categories" => "Editar categorías",
 "Add" => "Agregar",
 "Security Warning" => "Advertencia de seguridad",
@@ -122,7 +122,7 @@
 "Database tablespace" => "Espacio de tablas de la base de datos",
 "Database host" => "Host de la base de datos",
 "Finish setup" => "Completar la instalación",
-"web services under your control" => "servicios web controlados por vos",
+"%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!",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 803b36e1c31..4c0a41c5087 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Kasutaja %s jagas sinuga faili",
-"User %s shared a folder with you" => "Kasutaja %s jagas Sinuga kausta.",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Kasutaja %s jagas sinuga faili \"%s\". See on allalaadimiseks saadaval siin: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Kasutaja %s jagas sinuga kausta \"%s\". See on allalaadimiseks saadaval siin: %s",
 "Category type not provided." => "Kategooria tüüp puudub.",
 "No category to add?" => "Pole kategooriat, mida lisada?",
 "This category already exists: %s" => "See kategooria on juba olemas: %s",
@@ -105,6 +101,7 @@
 "Help" => "Abiinfo",
 "Access forbidden" => "Ligipääs on keelatud",
 "Cloud not found" => "Pilve ei leitud",
+"web services under your control" => "veebitenused sinu kontrolli all",
 "Edit categories" => "Muuda kategooriaid",
 "Add" => "Lisa",
 "Security Warning" => "Turvahoiatus",
@@ -125,7 +122,6 @@
 "Database tablespace" => "Andmebaasi tabeliruum",
 "Database host" => "Andmebaasi host",
 "Finish setup" => "Lõpeta seadistamine",
-"web services under your control" => "veebiteenused sinu kontrolli all",
 "%s is available. Get more information on how to update." => "%s on saadaval. Vaata lähemalt kuidas uuendada.",
 "Log out" => "Logi välja",
 "Automatic logon rejected!" => "Automaatne sisselogimine lükati tagasi!",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 1ec4ee8f5c4..117c0105756 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "%s erabiltzaileak zurekin fitxategi bat elkarbanatu du ",
-"User %s shared a folder with you" => "%s erabiltzaileak zurekin karpeta bat elkarbanatu du ",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s erabiltzaileak \"%s\" fitxategia zurekin elkarbanatu du. Hemen duzu eskuragarri:  %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s erabiltzaileak \"%s\" karpeta zurekin elkarbanatu du. Hemen duzu eskuragarri:  %s",
 "Category type not provided." => "Kategoria mota ez da zehaztu.",
 "No category to add?" => "Ez dago gehitzeko kategoriarik?",
 "This category already exists: %s" => "Kategoria hau dagoeneko existitzen da: %s",
@@ -102,6 +98,7 @@
 "Help" => "Laguntza",
 "Access forbidden" => "Sarrera debekatuta",
 "Cloud not found" => "Ez da hodeia aurkitu",
+"web services under your control" => "web zerbitzuak zure kontrolpean",
 "Edit categories" => "Editatu kategoriak",
 "Add" => "Gehitu",
 "Security Warning" => "Segurtasun abisua",
@@ -122,7 +119,6 @@
 "Database tablespace" => "Datu basearen taula-lekua",
 "Database host" => "Datubasearen hostalaria",
 "Finish setup" => "Bukatu konfigurazioa",
-"web services under your control" => "web zerbitzuak zure kontrolpean",
 "Log out" => "Saioa bukatu",
 "Automatic logon rejected!" => "Saio hasiera automatikoa ez onartuta!",
 "If you did not change your password recently, your account may be compromised!" => "Zure pasahitza orain dela gutxi ez baduzu aldatu, zure kontua arriskuan egon daiteke!",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index fb8a312587c..338b3ad4b21 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "کاربر %s  یک پرونده را با شما به اشتراک گذاشته است.",
-"User %s shared a folder with you" => "کاربر %s  یک پوشه را با شما به اشتراک گذاشته است.",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "کاربر %s پرونده \"%s\" را با شما به اشتراک گذاشته است. پرونده برای دانلود اینجاست : %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "کاربر %s پوشه \"%s\" را با شما به اشتراک گذاشته است. پرونده برای دانلود اینجاست : %s",
 "Category type not provided." => "نوع دسته بندی ارائه نشده است.",
 "No category to add?" => "آیا گروه دیگری برای افزودن ندارید",
 "This category already exists: %s" => "این دسته هم اکنون وجود دارد: %s",
@@ -102,6 +98,7 @@
 "Help" => "راه‌نما",
 "Access forbidden" => "اجازه دسترسی به مناطق ممنوعه را ندارید",
 "Cloud not found" => "پیدا نشد",
+"web services under your control" => "سرویس های تحت وب در کنترل شما",
 "Edit categories" => "ویرایش گروه",
 "Add" => "افزودن",
 "Security Warning" => "اخطار امنیتی",
@@ -122,7 +119,6 @@
 "Database tablespace" => "جدول پایگاه داده",
 "Database host" => "هاست پایگاه داده",
 "Finish setup" => "اتمام نصب",
-"web services under your control" => "سرویس های تحت وب در کنترل شما",
 "Log out" => "خروج",
 "Automatic logon rejected!" => "ورود به سیستم اتوماتیک ردشد!",
 "If you did not change your password recently, your account may be compromised!" => "اگر شما اخیرا رمزعبور را تغییر نداده اید، حساب شما در معرض خطر می باشد !",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 1f7a01e0e06..15349fb15ab 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Käyttäjä %s jakoi tiedoston kanssasi",
-"User %s shared a folder with you" => "Käyttäjä %s jakoi kansion kanssasi",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Käyttäjä %s jakoi tiedoston \"%s\" kanssasi. Se on ladattavissa täältä: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Käyttäjä %s jakoi kansion \"%s\" kanssasi. Se on ladattavissa täältä: %s",
 "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",
@@ -99,6 +95,7 @@
 "Help" => "Ohje",
 "Access forbidden" => "Pääsy estetty",
 "Cloud not found" => "Pilveä ei löydy",
+"web services under your control" => "verkkopalvelut hallinnassasi",
 "Edit categories" => "Muokkaa luokkia",
 "Add" => "Lisää",
 "Security Warning" => "Turvallisuusvaroitus",
@@ -118,7 +115,6 @@
 "Database tablespace" => "Tietokannan taulukkotila",
 "Database host" => "Tietokantapalvelin",
 "Finish setup" => "Viimeistele asennus",
-"web services under your control" => "verkkopalvelut hallinnassasi",
 "%s is available. Get more information on how to update." => "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan.",
 "Log out" => "Kirjaudu ulos",
 "Automatic logon rejected!" => "Automaattinen sisäänkirjautuminen hylättiin!",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 05660a12513..bc5d9e8cdde 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "L'utilisateur %s a partagé un fichier avec vous",
-"User %s shared a folder with you" => "L'utilsateur %s a partagé un dossier avec vous",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "L'utilisateur %s a partagé le fichier \"%s\" avec vous. Vous pouvez le télécharger ici : %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "L'utilisateur %s a partagé le dossier \"%s\" avec vous. Il est disponible au téléchargement ici : %s",
+"%s shared »%s« with you" => "%s partagé »%s« avec vous",
 "Category type not provided." => "Type de catégorie non spécifié.",
 "No category to add?" => "Pas de catégorie à ajouter ?",
 "This category already exists: %s" => "Cette catégorie existe déjà : %s",
@@ -93,6 +90,8 @@
 "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?",
+"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é",
 "To login page" => "Retour à la page d'authentification",
@@ -105,6 +104,8 @@
 "Help" => "Aide",
 "Access forbidden" => "Accès interdit",
 "Cloud not found" => "Introuvable",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Salut,\n\nje veux juste vous signaler %s partagé %s avec vous.\nVoyez-le: %s\n\nBonne continuation!",
+"web services under your control" => "services web sous votre contrôle",
 "Edit categories" => "Editer les catégories",
 "Add" => "Ajouter",
 "Security Warning" => "Avertissement de sécurité",
@@ -125,7 +126,6 @@
 "Database tablespace" => "Tablespaces de la base de données",
 "Database host" => "Serveur de la base de données",
 "Finish setup" => "Terminer l'installation",
-"web services under your control" => "services web sous votre contrôle",
 "%s is available. Get more information on how to update." => "%s est disponible. Obtenez plus d'informations sur la façon de mettre à jour.",
 "Log out" => "Se déconnecter",
 "Automatic logon rejected!" => "Connexion automatique rejetée !",
@@ -135,6 +135,7 @@
 "remember" => "se souvenir de moi",
 "Log in" => "Connexion",
 "Alternative Logins" => "Logins alternatifs",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Salut,<br><br>je veux juste vous signaler %s partagé »%s« avec vous.<br><a href=\"%s\">Voyez-le!</a><br><br>Bonne continuation!",
 "prev" => "précédent",
 "next" => "suivant",
 "Updating ownCloud to version %s, this may take a while." => "Mise à jour en cours d'ownCloud vers la version %s, cela peut prendre du temps."
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 98652695446..583fb73e57f 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "O usuario %s compartíu un ficheiro con vostede",
-"User %s shared a folder with you" => "O usuario %s compartíu un cartafol con vostede",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "O usuario %s compartiu o ficheiro «%s» con vostede. Teno dispoñíbel en: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "O usuario %s compartiu o cartafol «%s» con vostede. Teno dispoñíbel en: %s",
+"%s shared »%s« with you" => "%s compartiu «%s» con vostede",
 "Category type not provided." => "Non se indicou o tipo de categoría",
 "No category to add?" => "Sen categoría que engadir?",
 "This category already exists: %s" => "Esta categoría xa existe: %s",
@@ -93,6 +90,8 @@
 "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?",
+"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",
 "To login page" => "A páxina de conexión",
@@ -105,6 +104,8 @@
 "Help" => "Axuda",
 "Access forbidden" => "Acceso denegado",
 "Cloud not found" => "Nube non atopada",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ola,\n\nsó facerlle saber que %s compartiu %s con vostede.\nVéxao en: %s\n\nSaúdos!",
+"web services under your control" => "servizos web baixo o seu control",
 "Edit categories" => "Editar as categorías",
 "Add" => "Engadir",
 "Security Warning" => "Aviso de seguranza",
@@ -125,7 +126,6 @@
 "Database tablespace" => "Táboa de espazos da base de datos",
 "Database host" => "Servidor da base de datos",
 "Finish setup" => "Rematar a configuración",
-"web services under your control" => "servizos web baixo o seu control",
 "%s is available. Get more information on how to update." => "%s está dispoñíbel. Obteña máis información sobre como actualizar.",
 "Log out" => "Desconectar",
 "Automatic logon rejected!" => "Rexeitouse a entrada automática",
@@ -135,6 +135,7 @@
 "remember" => "lembrar",
 "Log in" => "Conectar",
 "Alternative Logins" => "Accesos 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!" => "Ola,<br><br>só facerlle saber que %s compartiu «%s» con vostede.<br><a href=\"%s\">Véxao!</a><br><br>Saúdos!",
 "prev" => "anterior",
 "next" => "seguinte",
 "Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a versión %s,  esto pode levar un anaco."
diff --git a/core/l10n/he.php b/core/l10n/he.php
index e74bde3e922..1095507673b 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "המשתמש %s שיתף אתך קובץ",
-"User %s shared a folder with you" => "המשתמש %s שיתף אתך תיקייה",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "המשתמש %s שיתף אתך את הקובץ „%s“. ניתן להוריד את הקובץ מכאן: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "המשתמש %s שיתף אתך את התיקייה „%s“. ניתן להוריד את התיקייה מכאן: %s",
 "Category type not provided." => "סוג הקטגוריה לא סופק.",
 "No category to add?" => "אין קטגוריה להוספה?",
 "This category already exists: %s" => "הקטגוריה הבאה כבר קיימת: %s",
@@ -105,6 +101,7 @@
 "Help" => "עזרה",
 "Access forbidden" => "הגישה נחסמה",
 "Cloud not found" => "ענן לא נמצא",
+"web services under your control" => "שירותי רשת תחת השליטה שלך",
 "Edit categories" => "ערוך קטגוריות",
 "Add" => "הוספה",
 "Security Warning" => "אזהרת אבטחה",
@@ -125,7 +122,6 @@
 "Database tablespace" => "מרחב הכתובות של מסד הנתונים",
 "Database host" => "שרת בסיס נתונים",
 "Finish setup" => "סיום התקנה",
-"web services under your control" => "שירותי רשת תחת השליטה שלך",
 "%s is available. Get more information on how to update." => "%s זמינה להורדה. ניתן ללחוץ כדי לקבל מידע נוסף כיצד לעדכן.",
 "Log out" => "התנתקות",
 "Automatic logon rejected!" => "בקשת הכניסה האוטומטית נדחתה!",
diff --git a/core/l10n/hi.php b/core/l10n/hi.php
index cb265e13191..afdd91d5f83 100644
--- a/core/l10n/hi.php
+++ b/core/l10n/hi.php
@@ -1,5 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "उपयोगकर्ता %s ने आप के साथ एक फ़ाइल सहभाजीत किया",
 "January" => "जनवरी",
 "February" => "फरवरी",
 "March" => "मार्च",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 660b47c54fd..80a34094b27 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -73,6 +73,7 @@
 "Help" => "Pomoć",
 "Access forbidden" => "Pristup zabranjen",
 "Cloud not found" => "Cloud nije pronađen",
+"web services under your control" => "web usluge pod vašom kontrolom",
 "Edit categories" => "Uredi kategorije",
 "Add" => "Dodaj",
 "Create an <strong>admin account</strong>" => "Stvori <strong>administratorski račun</strong>",
@@ -86,7 +87,6 @@
 "Database tablespace" => "Database tablespace",
 "Database host" => "Poslužitelj baze podataka",
 "Finish setup" => "Završi postavljanje",
-"web services under your control" => "web usluge pod vašom kontrolom",
 "Log out" => "Odjava",
 "Lost your password?" => "Izgubili ste lozinku?",
 "remember" => "zapamtiti",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 766e1bfc7ea..1e74fa7e062 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "%s felhasználó megosztott Önnel egy fájlt",
-"User %s shared a folder with you" => "%s felhasználó megosztott Önnel egy mappát",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s felhasználó megosztotta ezt az állományt Önnel: %s. A fájl innen tölthető le: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s felhasználó megosztotta ezt a mappát Önnel: %s. A mappa innen tölthető le: %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",
@@ -105,6 +101,7 @@
 "Help" => "Súgó",
 "Access forbidden" => "A hozzáférés nem engedélyezett",
 "Cloud not found" => "A felhő nem található",
+"web services under your control" => "webszolgáltatások saját kézben",
 "Edit categories" => "Kategóriák szerkesztése",
 "Add" => "Hozzáadás",
 "Security Warning" => "Biztonsági figyelmeztetés",
@@ -125,7 +122,6 @@
 "Database tablespace" => "Az adatbázis táblázattér (tablespace)",
 "Database host" => "Adatbázis szerver",
 "Finish setup" => "A beállítások befejezése",
-"web services under your control" => "webszolgáltatások saját kézben",
 "%s is available. Get more information on how to update." => "%s rendelkezésre áll. További információ a frissítéshez.",
 "Log out" => "Kilépés",
 "Automatic logon rejected!" => "Az automatikus bejelentkezés sikertelen!",
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index b6bb75f2b3b..9df7eda1dad 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -38,6 +38,7 @@
 "Help" => "Adjuta",
 "Access forbidden" => "Accesso prohibite",
 "Cloud not found" => "Nube non trovate",
+"web services under your control" => "servicios web sub tu controlo",
 "Edit categories" => "Modificar categorias",
 "Add" => "Adder",
 "Create an <strong>admin account</strong>" => "Crear un <strong>conto de administration</strong>",
@@ -49,7 +50,6 @@
 "Database password" => "Contrasigno de base de datos",
 "Database name" => "Nomine de base de datos",
 "Database host" => "Hospite de base de datos",
-"web services under your control" => "servicios web sub tu controlo",
 "Log out" => "Clauder le session",
 "Lost your password?" => "Tu perdeva le contrasigno?",
 "remember" => "memora",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 065a4f2e727..5fe8b542223 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "%s berbagi berkas dengan Anda",
-"User %s shared a folder with you" => "%s berbagi folder dengan Anda",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s berbagi berkas \"%s\" dengan Anda. Silakan unduh di sini: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s berbagi folder \"%s\" dengan Anda. Silakan unduh di sini: %s",
 "Category type not provided." => "Tipe kategori tidak diberikan.",
 "No category to add?" => "Tidak ada kategori yang akan ditambahkan?",
 "This category already exists: %s" => "Kategori ini sudah ada: %s",
@@ -102,6 +98,7 @@
 "Help" => "Bantuan",
 "Access forbidden" => "Akses ditolak",
 "Cloud not found" => "Cloud tidak ditemukan",
+"web services under your control" => "layanan web dalam kontrol Anda",
 "Edit categories" => "Edit kategori",
 "Add" => "Tambah",
 "Security Warning" => "Peringatan Keamanan",
@@ -122,7 +119,6 @@
 "Database tablespace" => "Tablespace basis data",
 "Database host" => "Host basis data",
 "Finish setup" => "Selesaikan instalasi",
-"web services under your control" => "layanan web dalam kontrol Anda",
 "Log out" => "Keluar",
 "Automatic logon rejected!" => "Masuk otomatis ditolak!",
 "If you did not change your password recently, your account may be compromised!" => "Jika tidak pernah mengubah sandi Anda baru-baru ini, akun Anda mungkin dalam bahaya!",
diff --git a/core/l10n/is.php b/core/l10n/is.php
index 7c6ae25be71..b8573b3624a 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Notandinn %s deildi skrá með þér",
-"User %s shared a folder with you" => "Notandinn %s deildi möppu með þér",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Notandinn %s deildi skránni \"%s\" með þér. Hægt er að hlaða henni niður hér: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Notandinn %s deildi möppunni \"%s\" með þér. Hægt er að hlaða henni niður hér: %s",
 "Category type not provided." => "Flokkur ekki gefin",
 "No category to add?" => "Enginn flokkur til að bæta við?",
 "Object type not provided." => "Tegund ekki í boði.",
@@ -100,6 +96,7 @@
 "Help" => "Hjálp",
 "Access forbidden" => "Aðgangur bannaður",
 "Cloud not found" => "Ský finnst ekki",
+"web services under your control" => "vefþjónusta undir þinni stjórn",
 "Edit categories" => "Breyta flokkum",
 "Add" => "Bæta við",
 "Security Warning" => "Öryggis aðvörun",
@@ -116,7 +113,6 @@
 "Database tablespace" => "Töflusvæði gagnagrunns",
 "Database host" => "Netþjónn gagnagrunns",
 "Finish setup" => "Virkja uppsetningu",
-"web services under your control" => "vefþjónusta undir þinni stjórn",
 "%s is available. Get more information on how to update." => "%s er til boða. Fáðu meiri upplýsingar um hvernig þú uppfærir.",
 "Log out" => "Útskrá",
 "Automatic logon rejected!" => "Sjálfvirkri innskráningu hafnað!",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index ce8f6411295..a06283cf411 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "L'utente %s ha condiviso un file con te",
-"User %s shared a folder with you" => "L'utente %s ha condiviso una cartella con te",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "L'utente %s ha condiviso il file \"%s\" con te. È disponibile per lo scaricamento qui: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "L'utente %s ha condiviso la cartella \"%s\" con te. È disponibile per lo scaricamento qui: %s",
+"%s shared »%s« with you" => "%s 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",
@@ -93,6 +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",
 "Request reset" => "Richiesta di ripristino",
 "Your password was reset" => "La password è stata ripristinata",
 "To login page" => "Alla pagina di accesso",
@@ -105,6 +104,8 @@
 "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!",
+"web services under your control" => "servizi web nelle tue mani",
 "Edit categories" => "Modifica categorie",
 "Add" => "Aggiungi",
 "Security Warning" => "Avviso di sicurezza",
@@ -125,7 +126,6 @@
 "Database tablespace" => "Spazio delle tabelle del database",
 "Database host" => "Host del database",
 "Finish setup" => "Termina la configurazione",
-"web services under your control" => "servizi web nelle tue mani",
 "%s is available. Get more information on how to update." => "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento.",
 "Log out" => "Esci",
 "Automatic logon rejected!" => "Accesso automatico rifiutato.",
@@ -135,6 +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!",
 "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."
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 8395a1d272e..5119330264f 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "ユーザ %s はあなたとファイルを共有しています",
-"User %s shared a folder with you" => "ユーザ %s はあなたとフォルダを共有しています",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "ユーザ %s はあなたとファイル \"%s\" を共有しています。こちらからダウンロードできます: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "ユーザ %s はあなたとフォルダ \"%s\" を共有しています。こちらからダウンロードできます: %s",
+"%s shared »%s« with you" => "%sが あなたと »%s«を共有しました",
 "Category type not provided." => "カテゴリタイプは提供されていません。",
 "No category to add?" => "追加するカテゴリはありませんか？",
 "This category already exists: %s" => "このカテゴリはすでに存在します: %s",
@@ -93,6 +90,8 @@
 "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?" => "ファイルが暗号化されているようです。復旧キーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？",
+"Yes, I really want to reset my password now" => "はい、今すぐパスワードをリセットします。",
 "Request reset" => "リセットを要求します。",
 "Your password was reset" => "あなたのパスワードはリセットされました。",
 "To login page" => "ログインページへ戻る",
@@ -105,6 +104,8 @@
 "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" => "追加",
 "Security Warning" => "セキュリティ警告",
@@ -125,7 +126,6 @@
 "Database tablespace" => "データベースの表領域",
 "Database host" => "データベースのホスト名",
 "Finish setup" => "セットアップを完了します",
-"web services under your control" => "管理下のウェブサービス",
 "%s is available. Get more information on how to update." => "%s が利用可能です。更新方法に関してさらに情報を取得して下さい。",
 "Log out" => "ログアウト",
 "Automatic logon rejected!" => "自動ログインは拒否されました！",
@@ -135,6 +135,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 に更新しています、しばらくお待ち下さい。"
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index b474548eae8..6674106f1d7 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "მომხმარებელმა  %s გაგიზიარათ ფაილი",
-"User %s shared a folder with you" => "მომხმარებელმა  %s გაგიზიარათ ფოლდერი",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "მომხმარებელმა %s გაგიზიარათ ფაილი \"%s\". ის ხელმისაწვდომია გადმოსაწერად აქ: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "მომხმარებელმა %s გაგიზიარათ ფოლდერი \"%s\". ის ხელმისაწვდომია გადმოსაწერად აქ: %s",
 "Category type not provided." => "კატეგორიის ტიპი არ არის განხილული.",
 "No category to add?" => "არ არის კატეგორია დასამატებლად?",
 "This category already exists: %s" => "კატეგორია უკვე არსებობს: %s",
@@ -102,6 +98,7 @@
 "Help" => "დახმარება",
 "Access forbidden" => "წვდომა აკრძალულია",
 "Cloud not found" => "ღრუბელი არ არსებობს",
+"web services under your control" => "web services under your control",
 "Edit categories" => "კატეგორიების რედაქტირება",
 "Add" => "დამატება",
 "Security Warning" => "უსაფრთხოების გაფრთხილება",
@@ -122,7 +119,6 @@
 "Database tablespace" => "ბაზის ცხრილის ზომა",
 "Database host" => "მონაცემთა ბაზის ჰოსტი",
 "Finish setup" => "კონფიგურაციის დასრულება",
-"web services under your control" => "web services under your control",
 "Log out" => "გამოსვლა",
 "Automatic logon rejected!" => "ავტომატური შესვლა უარყოფილია!",
 "If you did not change your password recently, your account may be compromised!" => "თუ თქვენ არ შეცვლით პაროლს, თქვენი ანგარიში შეიძლება იყოს დაშვებადი სხვებისთვის",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 6b97d672cfd..d95daaa3a73 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "%s 님이 파일을 공유하였습니다",
-"User %s shared a folder with you" => "%s 님이 폴더를 공유하였습니다",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s 님이 파일 \"%s\"을(를) 공유하였습니다. 여기에서 다운로드할 수 있습니다: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s 님이 폴더 \"%s\"을(를) 공유하였습니다. 여기에서 다운로드할 수 있습니다: %s",
 "Category type not provided." => "분류 형식이 제공되지 않았습니다.",
 "No category to add?" => "추가할 분류가 없습니까?",
 "This category already exists: %s" => "분류가 이미 존재합니다: %s",
@@ -102,6 +98,7 @@
 "Help" => "도움말",
 "Access forbidden" => "접근 금지됨",
 "Cloud not found" => "클라우드를 찾을 수 없습니다",
+"web services under your control" => "내가 관리하는 웹 서비스",
 "Edit categories" => "분류 수정",
 "Add" => "추가",
 "Security Warning" => "보안 경고",
@@ -122,7 +119,6 @@
 "Database tablespace" => "데이터베이스 테이블 공간",
 "Database host" => "데이터베이스 호스트",
 "Finish setup" => "설치 완료",
-"web services under your control" => "내가 관리하는 웹 서비스",
 "Log out" => "로그아웃",
 "Automatic logon rejected!" => "자동 로그인이 거부되었습니다!",
 "If you did not change your password recently, your account may be compromised!" => "최근에 암호를 변경하지 않았다면 계정이 탈취되었을 수도 있습니다!",
diff --git a/core/l10n/ku_IQ.php b/core/l10n/ku_IQ.php
index 3c223bad024..ab46b13a500 100644
--- a/core/l10n/ku_IQ.php
+++ b/core/l10n/ku_IQ.php
@@ -10,6 +10,7 @@
 "Admin" => "به‌ڕێوه‌به‌ری سه‌ره‌كی",
 "Help" => "یارمەتی",
 "Cloud not found" => "هیچ نه‌دۆزرایه‌وه‌",
+"web services under your control" => "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه",
 "Add" => "زیادکردن",
 "Advanced" => "هه‌ڵبژاردنی پیشكه‌وتوو",
 "Data folder" => "زانیاری فۆڵده‌ر",
@@ -18,7 +19,6 @@
 "Database name" => "ناوی داتابه‌یس",
 "Database host" => "هۆستی داتابه‌یس",
 "Finish setup" => "كۆتایی هات ده‌ستكاریه‌كان",
-"web services under your control" => "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه",
 "Log out" => "چوونەدەرەوە",
 "prev" => "پێشتر",
 "next" => "دواتر"
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 4c312df6618..dbe7a34de34 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -56,6 +56,7 @@
 "Help" => "Hëllef",
 "Access forbidden" => "Access net erlaabt",
 "Cloud not found" => "Cloud net fonnt",
+"web services under your control" => "Web Servicer ënnert denger Kontroll",
 "Edit categories" => "Kategorien editéieren",
 "Add" => "Dobäisetzen",
 "Security Warning" => "Sécherheets Warnung",
@@ -70,7 +71,6 @@
 "Database tablespace" => "Datebank Tabelle-Gréisst",
 "Database host" => "Datebank Server",
 "Finish setup" => "Installatioun ofschléissen",
-"web services under your control" => "Web Servicer ënnert denger Kontroll",
 "Log out" => "Ausloggen",
 "Lost your password?" => "Passwuert vergiess?",
 "remember" => "verhalen",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 9b41c6e131f..673ee83dca0 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Vartotojas %s pasidalino su jumis failu",
-"User %s shared a folder with you" => "Vartotojas %s su jumis pasidalino aplanku",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Vartotojas %s pasidalino failu \"%s\" su jumis. Jį atsisiųsti galite čia: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Vartotojas %s pasidalino aplanku \"%s\" su jumis. Jį atsisiųsti galite čia: %s",
 "Category type not provided." => "Kategorija nenurodyta.",
 "No category to add?" => "Nepridėsite jokios kategorijos?",
 "This category already exists: %s" => "Ši kategorija jau egzistuoja: %s",
@@ -105,6 +101,7 @@
 "Help" => "Pagalba",
 "Access forbidden" => "Priėjimas draudžiamas",
 "Cloud not found" => "Negalima rasti",
+"web services under your control" => "jūsų valdomos web paslaugos",
 "Edit categories" => "Redaguoti kategorijas",
 "Add" => "Pridėti",
 "Security Warning" => "Saugumo pranešimas",
@@ -125,7 +122,6 @@
 "Database tablespace" => "Duomenų bazės loginis saugojimas",
 "Database host" => "Duomenų bazės serveris",
 "Finish setup" => "Baigti diegimą",
-"web services under your control" => "jūsų valdomos web paslaugos",
 "%s is available. Get more information on how to update." => "%s yra prieinama. Gaukite daugiau informacijos apie atnaujinimą.",
 "Log out" => "Atsijungti",
 "Automatic logon rejected!" => "Automatinis prisijungimas atmestas!",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index e3d668d0183..b8bfe74c377 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Lietotājs %s ar jums dalījās ar datni.",
-"User %s shared a folder with you" => "Lietotājs %s ar jums dalījās ar mapi.",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Lietotājs %s ar jums dalījās ar datni “%s”. To var lejupielādēt šeit — %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Lietotājs %s ar jums dalījās ar mapi “%s”. To var lejupielādēt šeit — %s",
 "Category type not provided." => "Kategorijas tips nav norādīts.",
 "No category to add?" => "Nav kategoriju, ko pievienot?",
 "This category already exists: %s" => "Šāda kategorija jau eksistē — %s",
@@ -102,6 +98,7 @@
 "Help" => "Palīdzība",
 "Access forbidden" => "Pieeja ir liegta",
 "Cloud not found" => "Mākonis netika atrasts",
+"web services under your control" => "tīmekļa servisi tavā varā",
 "Edit categories" => "Rediģēt kategoriju",
 "Add" => "Pievienot",
 "Security Warning" => "Brīdinājums par drošību",
@@ -120,7 +117,6 @@
 "Database tablespace" => "Datubāzes tabulas telpa",
 "Database host" => "Datubāzes serveris",
 "Finish setup" => "Pabeigt iestatīšanu",
-"web services under your control" => "tīmekļa servisi tavā varā",
 "Log out" => "Izrakstīties",
 "Automatic logon rejected!" => "Automātiskā ierakstīšanās ir noraidīta!",
 "If you did not change your password recently, your account may be compromised!" => "Ja neesat pēdējā laikā mainījis paroli, iespējams, ka jūsu konts ir kompromitēts.",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index b0c39debb8a..de89403ee3c 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Корисникот %s сподели датотека со Вас",
-"User %s shared a folder with you" => "Корисникот %s сподели папка со Вас",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Корисникот %s ја сподели датотека „%s“ со Вас. Достапна е за преземање тука: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Корисникот %s ја сподели папката „%s“ со Вас. Достапна е за преземање тука: %s",
 "Category type not provided." => "Не беше доставен тип на категорија.",
 "No category to add?" => "Нема категорија да се додаде?",
 "Object type not provided." => "Не беше доставен тип на објект.",
@@ -98,6 +94,7 @@
 "Help" => "Помош",
 "Access forbidden" => "Забранет пристап",
 "Cloud not found" => "Облакот не е најден",
+"web services under your control" => "веб сервиси под Ваша контрола",
 "Edit categories" => "Уреди категории",
 "Add" => "Додади",
 "Security Warning" => "Безбедносно предупредување",
@@ -114,7 +111,6 @@
 "Database tablespace" => "Табела во базата на податоци",
 "Database host" => "Сервер со база",
 "Finish setup" => "Заврши го подесувањето",
-"web services under your control" => "веб сервиси под Ваша контрола",
 "Log out" => "Одјава",
 "Automatic logon rejected!" => "Одбиена автоматска најава!",
 "If you did not change your password recently, your account may be compromised!" => "Ако не сте ја промениле лозинката во скоро време, вашата сметка може да е компромитирана",
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index e7dc73a32c1..7a18acea7cc 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -44,6 +44,7 @@
 "Help" => "Bantuan",
 "Access forbidden" => "Larangan akses",
 "Cloud not found" => "Awan tidak dijumpai",
+"web services under your control" => "Perkhidmatan web di bawah kawalan anda",
 "Edit categories" => "Ubah kategori",
 "Add" => "Tambah",
 "Security Warning" => "Amaran keselamatan",
@@ -57,7 +58,6 @@
 "Database name" => "Nama pangkalan data",
 "Database host" => "Hos pangkalan data",
 "Finish setup" => "Setup selesai",
-"web services under your control" => "Perkhidmatan web di bawah kawalan anda",
 "Log out" => "Log keluar",
 "Lost your password?" => "Hilang kata laluan?",
 "remember" => "ingat",
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
index 6ea6a2c7bb5..614c353929d 100644
--- a/core/l10n/my_MM.php
+++ b/core/l10n/my_MM.php
@@ -46,6 +46,7 @@
 "Admin" => "အက်ဒမင်",
 "Help" => "အကူအညီ",
 "Cloud not found" => "မတွေ့ရှိမိပါ",
+"web services under your control" => "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services",
 "Add" => "ပေါင်းထည့်",
 "Security Warning" => "လုံခြုံရေးသတိပေးချက်",
 "Create an <strong>admin account</strong>" => "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်",
@@ -55,7 +56,6 @@
 "Database password" => "Database စကားဝှက်",
 "Database name" => "Database အမည်",
 "Finish setup" => "တပ်ဆင်ခြင်းပြီးပါပြီ။",
-"web services under your control" => "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services",
 "Lost your password?" => "သင်၏စကားဝှက်ပျောက်သွားပြီလား။",
 "remember" => "မှတ်မိစေသည်",
 "Log in" => "ဝင်ရောက်ရန်",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 30d3f91df2a..d6d9675d328 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -78,6 +78,7 @@
 "Help" => "Hjelp",
 "Access forbidden" => "Tilgang nektet",
 "Cloud not found" => "Sky ikke funnet",
+"web services under your control" => "web tjenester du kontrollerer",
 "Edit categories" => "Rediger kategorier",
 "Add" => "Legg til",
 "Security Warning" => "Sikkerhetsadvarsel",
@@ -92,7 +93,6 @@
 "Database tablespace" => "Database tabellområde",
 "Database host" => "Databasevert",
 "Finish setup" => "Fullfør oppsetting",
-"web services under your control" => "web tjenester du kontrollerer",
 "Log out" => "Logg ut",
 "Automatic logon rejected!" => "Automatisk pålogging avvist!",
 "If you did not change your password recently, your account may be compromised!" => "Hvis du ikke har endret passordet ditt nylig kan kontoen din være kompromitert",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 0f30a2f49aa..c28dead76dd 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Gebruiker %s deelde een bestand met u",
-"User %s shared a folder with you" => "Gebruiker %s deelde een map met u",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Gebruiker %s deelde bestand \"%s\" met u. Het is hier te downloaden: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Gebruiker %s deelde de map \"%s\" met u. De map is hier beschikbaar voor download: %s",
+"%s shared »%s« with you" => "%s deelde »%s« met u",
 "Category type not provided." => "Categorie type niet opgegeven.",
 "No category to add?" => "Geen categorie toevoegen?",
 "This category already exists: %s" => "Deze categorie bestaat al: %s",
@@ -93,6 +90,7 @@
 "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.",
 "Username" => "Gebruikersnaam",
+"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",
@@ -105,6 +103,8 @@
 "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!",
+"web services under your control" => "Webdiensten in eigen beheer",
 "Edit categories" => "Wijzig categorieën",
 "Add" => "Toevoegen",
 "Security Warning" => "Beveiligingswaarschuwing",
@@ -125,7 +125,6 @@
 "Database tablespace" => "Database tablespace",
 "Database host" => "Database server",
 "Finish setup" => "Installatie afronden",
-"web services under your control" => "Webdiensten in eigen beheer",
 "%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!",
@@ -135,6 +134,7 @@
 "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!",
 "prev" => "vorige",
 "next" => "volgende",
 "Updating ownCloud to version %s, this may take a while." => "Updaten ownCloud naar versie %s, dit kan even duren."
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index de181ccc7ad..67dbe32ff61 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Brukaren %s delte ei fil med deg",
-"User %s shared a folder with you" => "Brukaren %s delte ei mappe med deg",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Brukaren %s delte fila «%s» med deg. Du kan lasta ho ned her: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Brukaren %s delte mappa «%s» med deg. Du kan lasta ho ned her: %s",
 "Category type not provided." => "Ingen kategoritype.",
 "No category to add?" => "Ingen kategori å leggja til?",
 "This category already exists: %s" => "Denne kategorien finst alt: %s",
@@ -104,6 +100,7 @@
 "Help" => "Hjelp",
 "Access forbidden" => "Tilgang forbudt",
 "Cloud not found" => "Fann ikkje skyen",
+"web services under your control" => "Vev tjenester under din kontroll",
 "Edit categories" => "Endra kategoriar",
 "Add" => "Legg til",
 "Security Warning" => "Tryggleiksåtvaring",
@@ -124,7 +121,6 @@
 "Database tablespace" => "Tabellnamnrom for database",
 "Database host" => "Databasetenar",
 "Finish setup" => "Fullfør oppsettet",
-"web services under your control" => "Vevtenester under din kontroll",
 "%s is available. Get more information on how to update." => "%s er tilgjengeleg. Få meir informasjon om korleis du oppdaterer.",
 "Log out" => "Logg ut",
 "Automatic logon rejected!" => "Automatisk innlogging avvist!",
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index 1d14428f183..4440444885d 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -74,6 +74,7 @@
 "Help" => "Ajuda",
 "Access forbidden" => "Acces enebit",
 "Cloud not found" => "Nívol pas trobada",
+"web services under your control" => "Services web jos ton contraròtle",
 "Edit categories" => "Edita categorias",
 "Add" => "Ajusta",
 "Security Warning" => "Avertiment de securitat",
@@ -88,7 +89,6 @@
 "Database tablespace" => "Espandi de taula de basa de donadas",
 "Database host" => "Òste de basa de donadas",
 "Finish setup" => "Configuracion acabada",
-"web services under your control" => "Services web jos ton contraròtle",
 "Log out" => "Sortida",
 "Lost your password?" => "L'as perdut lo senhal ?",
 "remember" => "bremba-te",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 045da821f2e..9e1f76e4c0e 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Użytkownik %s udostępnił ci plik",
-"User %s shared a folder with you" => "Użytkownik %s udostępnił ci folder",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Użytkownik %s udostępnił ci plik „%s”. Możesz pobrać go stąd: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Użytkownik %s udostępnił ci folder „%s”. Możesz pobrać go stąd: %s",
 "Category type not provided." => "Nie podano typu kategorii.",
 "No category to add?" => "Brak kategorii do dodania?",
 "This category already exists: %s" => "Ta kategoria już istnieje: %s",
@@ -105,6 +101,7 @@
 "Help" => "Pomoc",
 "Access forbidden" => "Dostęp zabroniony",
 "Cloud not found" => "Nie odnaleziono chmury",
+"web services under your control" => "Kontrolowane serwisy",
 "Edit categories" => "Edytuj kategorie",
 "Add" => "Dodaj",
 "Security Warning" => "Ostrzeżenie o zabezpieczeniach",
@@ -125,7 +122,6 @@
 "Database tablespace" => "Obszar tabel bazy danych",
 "Database host" => "Komputer bazy danych",
 "Finish setup" => "Zakończ konfigurowanie",
-"web services under your control" => "Kontrolowane serwisy",
 "%s is available. Get more information on how to update." => "%s jest dostępna. Dowiedz się więcej na temat aktualizacji.",
 "Log out" => "Wyloguj",
 "Automatic logon rejected!" => "Automatyczne logowanie odrzucone!",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 59c8f69aee7..028f5f3e561 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "O usuário %s compartilhou um arquivo com você",
-"User %s shared a folder with you" => "O usuário %s compartilhou uma pasta com você",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "O usuário %s compartilhou com você o arquivo \"%s\", que está disponível para download em: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "O usuário %s compartilhou com você a pasta \"%s\", que está disponível para download em: %s",
 "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",
@@ -105,6 +101,7 @@
 "Help" => "Ajuda",
 "Access forbidden" => "Acesso proibido",
 "Cloud not found" => "Cloud não encontrado",
+"web services under your control" => "serviços web sob seu controle",
 "Edit categories" => "Editar categorias",
 "Add" => "Adicionar",
 "Security Warning" => "Aviso de Segurança",
@@ -125,7 +122,6 @@
 "Database tablespace" => "Espaço de tabela do banco de dados",
 "Database host" => "Host do banco de dados",
 "Finish setup" => "Concluir configuração",
-"web services under your control" => "serviços web sob seu controle",
 "%s is available. Get more information on how to update." => "%s está disponível. Obtenha mais informações sobre como atualizar.",
 "Log out" => "Sair",
 "Automatic logon rejected!" => "Entrada Automática no Sistema Rejeitada!",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index f6de2db4fb6..77c27b641d1 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "O utilizador %s partilhou um ficheiro consigo.",
-"User %s shared a folder with you" => "O utilizador %s partilhou uma pasta consigo.",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "O utilizador %s partilhou o ficheiro \"%s\" consigo. Está disponível para download aqui: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "O utilizador %s partilhou a pasta \"%s\" consigo. Está disponível para download aqui: %s",
 "Category type not provided." => "Tipo de categoria não fornecido",
 "No category to add?" => "Nenhuma categoria para adicionar?",
 "This category already exists: %s" => "A categoria já existe: %s",
@@ -105,6 +101,7 @@
 "Help" => "Ajuda",
 "Access forbidden" => "Acesso interdito",
 "Cloud not found" => "Cloud nao encontrada",
+"web services under your control" => "serviços web sob o seu controlo",
 "Edit categories" => "Editar categorias",
 "Add" => "Adicionar",
 "Security Warning" => "Aviso de Segurança",
@@ -125,7 +122,6 @@
 "Database tablespace" => "Tablespace da base de dados",
 "Database host" => "Anfitrião da base de dados",
 "Finish setup" => "Acabar instalação",
-"web services under your control" => "serviços web sob o seu controlo",
 "%s is available. Get more information on how to update." => "%s está disponível. Tenha mais informações como actualizar.",
 "Log out" => "Sair",
 "Automatic logon rejected!" => "Login automático rejeitado!",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 3d25a5f042b..4a430fb7d2f 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Utilizatorul %s a partajat un fișier cu tine",
-"User %s shared a folder with you" => "Utilizatorul %s a partajat un dosar cu tine",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Utilizatorul %s a partajat fișierul \"%s\" cu tine. Îl poți descărca de aici: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Utilizatorul %s a partajat dosarul \"%s\" cu tine. Îl poți descărca de aici: %s ",
 "Category type not provided." => "Tipul de categorie nu este prevazut",
 "No category to add?" => "Nici o categorie de adăugat?",
 "This category already exists: %s" => "Această categorie deja există: %s",
@@ -104,6 +100,7 @@
 "Help" => "Ajutor",
 "Access forbidden" => "Acces interzis",
 "Cloud not found" => "Nu s-a găsit",
+"web services under your control" => "servicii web controlate de tine",
 "Edit categories" => "Editează categorii",
 "Add" => "Adaugă",
 "Security Warning" => "Avertisment de securitate",
@@ -124,7 +121,6 @@
 "Database tablespace" => "Tabela de spațiu a bazei de date",
 "Database host" => "Bază date",
 "Finish setup" => "Finalizează instalarea",
-"web services under your control" => "servicii web controlate de tine",
 "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",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 608b9271df5..293ac9ec119 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Пользователь %s поделился с вами файлом",
-"User %s shared a folder with you" => "Пользователь %s открыл вам доступ к папке",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Пользователь %s открыл вам доступ к файлу \"%s\". Он доступен для загрузки здесь: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Пользователь %s открыл вам доступ к папке \"%s\". Она доступна для загрузки здесь: %s",
 "Category type not provided." => "Тип категории не предоставлен",
 "No category to add?" => "Нет категорий для добавления?",
 "This category already exists: %s" => "Эта категория уже существует: %s",
@@ -105,6 +101,7 @@
 "Help" => "Помощь",
 "Access forbidden" => "Доступ запрещён",
 "Cloud not found" => "Облако не найдено",
+"web services under your control" => "веб-сервисы под вашим управлением",
 "Edit categories" => "Редактировать категрии",
 "Add" => "Добавить",
 "Security Warning" => "Предупреждение безопасности",
@@ -125,7 +122,6 @@
 "Database tablespace" => "Табличое пространство базы данных",
 "Database host" => "Хост базы данных",
 "Finish setup" => "Завершить установку",
-"web services under your control" => "веб-сервисы под вашим управлением",
 "%s is available. Get more information on how to update." => "%s доступно. Получить дополнительную информацию о порядке обновления.",
 "Log out" => "Выйти",
 "Automatic logon rejected!" => "Автоматический вход в систему отключен!",
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index be7c1a24aad..b27f1c6c985 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -66,6 +66,7 @@
 "Help" => "උදව්",
 "Access forbidden" => "ඇතුල් වීම තහනම්",
 "Cloud not found" => "සොයා ගත නොහැක",
+"web services under your control" => "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්",
 "Edit categories" => "ප්‍රභේදයන් සංස්කරණය",
 "Add" => "එකතු කරන්න",
 "Security Warning" => "ආරක්ෂක නිවේදනයක්",
@@ -79,7 +80,6 @@
 "Database name" => "දත්තගබඩාවේ නම",
 "Database host" => "දත්තගබඩා සේවාදායකයා",
 "Finish setup" => "ස්ථාපනය කිරීම අවසන් කරන්න",
-"web services under your control" => "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්",
 "Log out" => "නික්මීම",
 "Lost your password?" => "මුරපදය අමතකද?",
 "remember" => "මතක තබාගන්න",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 2dfaa01b5a1..29febc283b7 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Používateľ %s zdieľa s Vami súbor",
-"User %s shared a folder with you" => "Používateľ %s zdieľa s Vami priečinok",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Používateľ %s zdieľa s Vami súbor \"%s\".  Môžete si ho stiahnuť tu: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Používateľ %s zdieľa s Vami priečinok \"%s\".  Môžete si ho stiahnuť tu: %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.",
@@ -104,6 +100,7 @@
 "Help" => "Pomoc",
 "Access forbidden" => "Prístup odmietnutý",
 "Cloud not found" => "Nenájdené",
+"web services under your control" => "webové služby pod Vašou kontrolou",
 "Edit categories" => "Upraviť kategórie",
 "Add" => "Pridať",
 "Security Warning" => "Bezpečnostné varovanie",
@@ -124,7 +121,6 @@
 "Database tablespace" => "Tabuľkový priestor databázy",
 "Database host" => "Server databázy",
 "Finish setup" => "Dokončiť inštaláciu",
-"web services under your control" => "webové služby pod Vašou kontrolou",
 "%s is available. Get more information on how to update." => "%s je dostupná. Získajte viac informácií k postupu aktualizáce.",
 "Log out" => "Odhlásiť",
 "Automatic logon rejected!" => "Automatické prihlásenie bolo zamietnuté!",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index a433aa2cc4e..3b539f7fe22 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Uporabnik %s je omogočil souporabo datoteke",
-"User %s shared a folder with you" => "Uporabnik %s je omogočil souporabo mape",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Uporabnik %s je omogočil souporabo datoteke \"%s\". Prejmete jo lahko preko povezave: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uporabnik %s je omogočil souporabo mape \"%s\". Prejmete jo lahko preko povezave: %s",
 "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",
@@ -104,6 +100,7 @@
 "Help" => "Pomoč",
 "Access forbidden" => "Dostop je prepovedan",
 "Cloud not found" => "Oblaka ni mogoče najti",
+"web services under your control" => "spletne storitve pod vašim nadzorom",
 "Edit categories" => "Uredi kategorije",
 "Add" => "Dodaj",
 "Security Warning" => "Varnostno opozorilo",
@@ -124,7 +121,6 @@
 "Database tablespace" => "Razpredelnica podatkovne zbirke",
 "Database host" => "Gostitelj podatkovne zbirke",
 "Finish setup" => "Končaj namestitev",
-"web services under your control" => "spletne storitve pod vašim nadzorom",
 "%s is available. Get more information on how to update." => "%s je na voljo. Pridobite več podrobnosti za posodobitev.",
 "Log out" => "Odjava",
 "Automatic logon rejected!" => "Samodejno prijavljanje je zavrnjeno!",
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index 40562add933..f5d7d933768 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Përdoruesi %s ndau me ju një skedar",
-"User %s shared a folder with you" => "Përdoruesi %s ndau me ju një dosje",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Përdoruesi %s ndau me ju skedarin \"%s\". Ky skedar është gati për shkarkim nga këtu: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Përdoruesi %s ndau me ju dosjen \"%s\". Kjo dosje është gati për shkarkim nga këto: %s",
 "Category type not provided." => "Mungon tipi i kategorisë.",
 "No category to add?" => "Asnjë kategori për të shtuar?",
 "This category already exists: %s" => "Kjo kategori tashmë ekziston: %s",
@@ -104,6 +100,7 @@
 "Help" => "Ndihmë",
 "Access forbidden" => "Ndalohet hyrja",
 "Cloud not found" => "Cloud-i nuk u gjet",
+"web services under your control" => "shërbime web nën kontrollin tënd",
 "Edit categories" => "Ndrysho kategoritë",
 "Add" => "Shto",
 "Security Warning" => "Paralajmërim sigurie",
@@ -124,7 +121,6 @@
 "Database tablespace" => "Tablespace-i i database-it",
 "Database host" => "Pozicioni (host) i database-it",
 "Finish setup" => "Mbaro setup-in",
-"web services under your control" => "shërbime web nën kontrollin tënd",
 "Log out" => "Dalje",
 "Automatic logon rejected!" => "Hyrja automatike u refuzua!",
 "If you did not change your password recently, your account may be compromised!" => "Nqse nuk keni ndryshuar kodin kohët e fundit, llogaria juaj mund të jetë komprometuar.",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 49664f19f34..a85e1bfb7e1 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -1,6 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Корисник %s дели са вама датотеку",
-"User %s shared a folder with you" => "Корисник %s дели са вама директоријум",
 "Category type not provided." => "Врста категорије није унет.",
 "No category to add?" => "Додати још неку категорију?",
 "Object type not provided." => "Врста објекта није унета.",
@@ -95,6 +93,7 @@
 "Help" => "Помоћ",
 "Access forbidden" => "Забрањен приступ",
 "Cloud not found" => "Облак није нађен",
+"web services under your control" => "веб сервиси под контролом",
 "Edit categories" => "Измени категорије",
 "Add" => "Додај",
 "Security Warning" => "Сигурносно упозорење",
@@ -111,7 +110,6 @@
 "Database tablespace" => "Радни простор базе података",
 "Database host" => "Домаћин базе",
 "Finish setup" => "Заврши подешавање",
-"web services under your control" => "веб сервиси под контролом",
 "Log out" => "Одјава",
 "Automatic logon rejected!" => "Аутоматска пријава је одбијена!",
 "If you did not change your password recently, your account may be compromised!" => "Ако ускоро не промените лозинку ваш налог може бити компромитован!",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 841ffe0d5da..68abe9bd154 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Användare %s delade en fil med dig",
-"User %s shared a folder with you" => "Användare %s delade en mapp med dig",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Användare %s delade filen \"%s\" med dig. Den finns att ladda ner här: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Användare %s delade mappen \"%s\" med dig. Den finns att ladda ner här: %s",
+"%s shared »%s« with you" => "%s delade »%s« med dig",
 "Category type not provided." => "Kategorityp inte angiven.",
 "No category to add?" => "Ingen kategori att lägga till?",
 "This category already exists: %s" => "Denna kategori finns redan: %s",
@@ -86,13 +83,15 @@
 "Sending ..." => "Skickar ...",
 "Email sent" => "E-post skickat",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-gemenskapen</a>.",
-"The update was successful. Redirecting you to ownCloud now." => "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud",
+"The update was successful. Redirecting you to ownCloud now." => "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud.",
 "ownCloud password reset" => "ownCloud lösenordsåterställning",
 "Use the following link to reset your password: {link}" => "Använd följande länk för att återställa lösenordet: {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 ." => "Länken för att återställa ditt lösenorden har skickats till din e-postadress<br>Om du inte har erhållit meddelandet inom kort, vänligen kontrollera din skräppost-mapp<br>Om den inte finns där, vänligen kontakta din administratör.",
 "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",
 "To login page" => "Till logginsidan",
@@ -105,6 +104,8 @@
 "Help" => "Hjälp",
 "Access forbidden" => "Åtkomst förbjuden",
 "Cloud not found" => "Hittade inget moln",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hej där,⏎\n⏎\nville bara meddela dig att %s delade %s med dig.⏎\nTitta på den: %s⏎\n⏎\nVi hörs!",
+"web services under your control" => "webbtjänster under din kontroll",
 "Edit categories" => "Editera kategorier",
 "Add" => "Lägg till",
 "Security Warning" => "Säkerhetsvarning",
@@ -125,8 +126,7 @@
 "Database tablespace" => "Databas tabellutrymme",
 "Database host" => "Databasserver",
 "Finish setup" => "Avsluta installation",
-"web services under your control" => "webbtjänster under din kontroll",
-"%s is available. Get more information on how to update." => "%s är tillgänglig. Få mer information om hur du går tillväga för att uppdatera",
+"%s is available. Get more information on how to update." => "%s är tillgänglig. Få mer information om hur du går tillväga för att uppdatera.",
 "Log out" => "Logga ut",
 "Automatic logon rejected!" => "Automatisk inloggning inte tillåten!",
 "If you did not change your password recently, your account may be compromised!" => "Om du inte har ändrat ditt lösenord nyligen så kan ditt konto vara manipulerat!",
@@ -135,6 +135,7 @@
 "remember" => "kom ihåg",
 "Log in" => "Logga in",
 "Alternative Logins" => "Alternativa inloggningar",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hej där,<br><br>ville bara informera dig om att %s delade »%s« med dig.<br><a href=\"%s\">Titta på den!</a><br><br>Hörs!",
 "prev" => "föregående",
 "next" => "nästa",
 "Updating ownCloud to version %s, this may take a while." => "Uppdaterar ownCloud till version %s, detta kan ta en stund."
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index b67f5e967ec..0770805ddf5 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -90,6 +90,7 @@
 "Help" => "உதவி",
 "Access forbidden" => "அணுக தடை",
 "Cloud not found" => "Cloud காணப்படவில்லை",
+"web services under your control" => "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது",
 "Edit categories" => "வகைகளை தொகுக்க",
 "Add" => "சேர்க்க",
 "Security Warning" => "பாதுகாப்பு எச்சரிக்கை",
@@ -106,7 +107,6 @@
 "Database tablespace" => "தரவுத்தள அட்டவணை",
 "Database host" => "தரவுத்தள ஓம்புனர்",
 "Finish setup" => "அமைப்பை முடிக்க",
-"web services under your control" => "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது",
 "Log out" => "விடுபதிகை செய்க",
 "Automatic logon rejected!" => "தன்னிச்சையான புகுபதிகை நிராகரிப்பட்டது!",
 "If you did not change your password recently, your account may be compromised!" => "உங்களுடைய கடவுச்சொல்லை அண்மையில் மாற்றவில்லையின், உங்களுடைய கணக்கு சமரசமாகிவிடும்!",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 66f5629b933..83642ed89cb 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "ผู้ใช้งาน %s ได้แชร์ไฟล์ให้กับคุณ",
-"User %s shared a folder with you" => "ผู้ใช้งาน %s ได้แชร์โฟลเดอร์ให้กับคุณ",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "ผู้ใช้งาน %s ได้แชร์ไฟล์ \"%s\" ให้กับคุณ และคุณสามารถสามารถดาวน์โหลดไฟล์ดังกล่าวได้จากที่นี่: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "ผู้ใช้งาน %s ได้แชร์โฟลเดอร์ \"%s\" ให้กับคุณ และคุณสามารถดาวน์โหลดโฟลเดอร์ดังกล่าวได้จากที่นี่: %s",
 "Category type not provided." => "ยังไม่ได้ระบุชนิดของหมวดหมู่",
 "No category to add?" => "ไม่มีหมวดหมู่ที่ต้องการเพิ่ม?",
 "Object type not provided." => "ชนิดของวัตถุยังไม่ได้ถูกระบุ",
@@ -101,6 +97,7 @@
 "Help" => "ช่วยเหลือ",
 "Access forbidden" => "การเข้าถึงถูกหวงห้าม",
 "Cloud not found" => "ไม่พบ Cloud",
+"web services under your control" => "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้",
 "Edit categories" => "แก้ไขหมวดหมู่",
 "Add" => "เพิ่ม",
 "Security Warning" => "คำเตือนเกี่ยวกับความปลอดภัย",
@@ -117,7 +114,6 @@
 "Database tablespace" => "พื้นที่ตารางในฐานข้อมูล",
 "Database host" => "Database host",
 "Finish setup" => "ติดตั้งเรียบร้อยแล้ว",
-"web services under your control" => "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้",
 "Log out" => "ออกจากระบบ",
 "Automatic logon rejected!" => "การเข้าสู่ระบบอัตโนมัติถูกปฏิเสธแล้ว",
 "If you did not change your password recently, your account may be compromised!" => "หากคุณยังไม่ได้เปลี่ยนรหัสผ่านของคุณเมื่อเร็วๆนี้, บัญชีของคุณอาจถูกบุกรุกโดยผู้อื่น",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 16943914e7e..f6112040c50 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "%s kullanıcısı sizinle bir dosyayı paylaştı",
-"User %s shared a folder with you" => "%s kullanıcısı sizinle bir dizini paylaştı",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s kullanıcısı \"%s\" dosyasını sizinle paylaştı. %s adresinden indirilebilir",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s kullanıcısı \"%s\" dizinini sizinle paylaştı. %s adresinden indirilebilir",
 "Category type not provided." => "Kategori türü desteklenmemektedir.",
 "No category to add?" => "Eklenecek kategori yok?",
 "This category already exists: %s" => "Bu kategori zaten mevcut:  %s",
@@ -105,6 +101,7 @@
 "Help" => "Yardım",
 "Access forbidden" => "Erişim yasaklı",
 "Cloud not found" => "Bulut bulunamadı",
+"web services under your control" => "Bilgileriniz güvenli ve şifreli",
 "Edit categories" => "Kategorileri düzenle",
 "Add" => "Ekle",
 "Security Warning" => "Güvenlik Uyarisi",
@@ -125,7 +122,6 @@
 "Database tablespace" => "Veritabanı tablo alanı",
 "Database host" => "Veritabanı sunucusu",
 "Finish setup" => "Kurulumu tamamla",
-"web services under your control" => "Bilgileriniz güvenli ve şifreli",
 "%s is available. Get more information on how to update." => "%s mevcuttur. Güncelleştirme hakkında daha fazla bilgi alın.",
 "Log out" => "Çıkış yap",
 "Automatic logon rejected!" => "Otomatik oturum açma reddedildi!",
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 65577297c3c..11ebda3af89 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "Користувач %s поділився файлом з вами",
-"User %s shared a folder with you" => "Користувач %s поділився текою з вами",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Користувач %s поділився файлом \"%s\" з вами. Він доступний для завантаження звідси: %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Користувач %s поділився текою \"%s\" з вами. Він доступний для завантаження звідси: %s",
 "Category type not provided." => "Не вказано тип категорії.",
 "No category to add?" => "Відсутні категорії для додавання?",
 "This category already exists: %s" => "Ця категорія вже існує: %s",
@@ -102,6 +98,7 @@
 "Help" => "Допомога",
 "Access forbidden" => "Доступ заборонено",
 "Cloud not found" => "Cloud не знайдено",
+"web services under your control" => "підконтрольні Вам веб-сервіси",
 "Edit categories" => "Редагувати категорії",
 "Add" => "Додати",
 "Security Warning" => "Попередження про небезпеку",
@@ -122,7 +119,6 @@
 "Database tablespace" => "Таблиця бази даних",
 "Database host" => "Хост бази даних",
 "Finish setup" => "Завершити налаштування",
-"web services under your control" => "підконтрольні Вам веб-сервіси",
 "Log out" => "Вихід",
 "Automatic logon rejected!" => "Автоматичний вхід в систему відхилений!",
 "If you did not change your password recently, your account may be compromised!" => "Якщо Ви не міняли пароль останнім часом, Ваш обліковий запис може бути скомпрометованим!",
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
index cf26212c25e..0e0489bf33d 100644
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@@ -55,6 +55,7 @@
 "Help" => "مدد",
 "Access forbidden" => "پہنچ کی اجازت نہیں",
 "Cloud not found" => "نہیں مل سکا",
+"web services under your control" => "آپ کے اختیار میں ویب سروسیز",
 "Edit categories" => "زمرہ جات کی تدوین کریں",
 "Add" => "شامل کریں",
 "Create an <strong>admin account</strong>" => "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں",
@@ -68,7 +69,6 @@
 "Database tablespace" => "ڈیٹابیس ٹیبل سپیس",
 "Database host" => "ڈیٹابیس ہوسٹ",
 "Finish setup" => "سیٹ اپ ختم کریں",
-"web services under your control" => "آپ کے اختیار میں ویب سروسیز",
 "Log out" => "لاگ آؤٹ",
 "Lost your password?" => "کیا آپ پاسورڈ بھول گئے ہیں؟",
 "remember" => "یاد رکھیں",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 3e320ecf800..ebe6c7006ff 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "%s chia sẻ tập tin này cho bạn",
-"User %s shared a folder with you" => "%s chia sẻ thư mục này cho bạn",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Người dùng %s chia sẻ tập tin \"%s\" cho bạn .Bạn có thể tải tại đây : %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Người dùng %s chia sẻ thư mục \"%s\" cho bạn .Bạn có thể tải tại đây : %s",
 "Category type not provided." => "Kiểu hạng mục không được cung cấp.",
 "No category to add?" => "Không có danh mục được thêm?",
 "This category already exists: %s" => "Danh mục này đã tồn tại: %s",
@@ -104,6 +100,7 @@
 "Help" => "Giúp đỡ",
 "Access forbidden" => "Truy cập bị cấm",
 "Cloud not found" => "Không tìm thấy Clound",
+"web services under your control" => "dịch vụ web dưới sự kiểm soát của bạn",
 "Edit categories" => "Sửa chuyên mục",
 "Add" => "Thêm",
 "Security Warning" => "Cảnh bảo bảo mật",
@@ -124,7 +121,6 @@
 "Database tablespace" => "Cơ sở dữ liệu tablespace",
 "Database host" => "Database host",
 "Finish setup" => "Cài đặt hoàn tất",
-"web services under your control" => "dịch vụ web dưới sự kiểm soát của bạn",
 "%s is available. Get more information on how to update." => "%s còn trống. Xem thêm thông tin cách cập nhật.",
 "Log out" => "Đăng xuất",
 "Automatic logon rejected!" => "Tự động đăng nhập đã bị từ chối !",
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index b4bc6fb3ef7..b4cc129964b 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "用户 %s 与您分享了一个文件",
-"User %s shared a folder with you" => "用户 %s 与您分享了一个文件夹",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "用户 %s 与您分享了文件“%s”。点击下载：%s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "用户 %s 与您分享了文件夹“%s”。点击下载：%s",
 "Category type not provided." => "未选择分类类型。",
 "No category to add?" => "没有分类添加了?",
 "This category already exists: %s" => "此分类已存在：%s",
@@ -101,6 +97,7 @@
 "Help" => "帮助",
 "Access forbidden" => "禁止访问",
 "Cloud not found" => "云 没有被找到",
+"web services under your control" => "您控制的网络服务",
 "Edit categories" => "编辑分类",
 "Add" => "添加",
 "Security Warning" => "安全警告",
@@ -120,7 +117,6 @@
 "Database tablespace" => "数据库表格空间",
 "Database host" => "数据库主机",
 "Finish setup" => "完成安装",
-"web services under your control" => "您控制的网络服务",
 "Log out" => "注销",
 "Automatic logon rejected!" => "自动登录被拒绝！",
 "If you did not change your password recently, your account may be compromised!" => "如果您最近没有修改您的密码，那您的帐号可能被攻击了！",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 016a1362569..29fef5ff220 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "用户 %s 与您共享了一个文件",
-"User %s shared a folder with you" => "用户 %s 与您共享了一个文件夹",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "用户 %s 与您共享了文件\"%s\"。文件下载地址：%s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "用户 %s 与您共享了文件夹\"%s\"。文件夹下载地址：%s",
 "Category type not provided." => "未提供分类类型。",
 "No category to add?" => "没有可添加分类？",
 "This category already exists: %s" => "此分类已存在：%s",
@@ -105,6 +101,7 @@
 "Help" => "帮助",
 "Access forbidden" => "访问禁止",
 "Cloud not found" => "未找到云",
+"web services under your control" => "您控制的web服务",
 "Edit categories" => "编辑分类",
 "Add" => "增加",
 "Security Warning" => "安全警告",
@@ -125,7 +122,6 @@
 "Database tablespace" => "数据库表空间",
 "Database host" => "数据库主机",
 "Finish setup" => "安装完成",
-"web services under your control" => "您控制的web服务",
 "%s is available. Get more information on how to update." => "%s 可用。获取更多关于如何升级的信息。",
 "Log out" => "注销",
 "Automatic logon rejected!" => "自动登录被拒绝！",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 10279c7ba18..0270e921e34 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -1,8 +1,4 @@
 <?php $TRANSLATIONS = array(
-"User %s shared a file with you" => "用戶 %s 與您分享了一個檔案",
-"User %s shared a folder with you" => "用戶 %s 與您分享了一個資料夾",
-"User %s shared the file \"%s\" with you. It is available for download here: %s" => "用戶 %s 與您分享了檔案 \"%s\" ，您可以從這裡下載它： %s",
-"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "用戶 %s 與您分享了資料夾 \"%s\" ，您可以從這裡下載它： %s",
 "Category type not provided." => "未提供分類類型。",
 "No category to add?" => "沒有可增加的分類？",
 "This category already exists: %s" => "分類已經存在： %s",
@@ -105,6 +101,7 @@
 "Help" => "說明",
 "Access forbidden" => "存取被拒",
 "Cloud not found" => "未發現雲端",
+"web services under your control" => "由您控制的網路服務",
 "Edit categories" => "編輯分類",
 "Add" => "增加",
 "Security Warning" => "安全性警告",
@@ -125,7 +122,6 @@
 "Database tablespace" => "資料庫 tablespace",
 "Database host" => "資料庫主機",
 "Finish setup" => "完成設定",
-"web services under your control" => "由您控制的網路服務",
 "%s is available. Get more information on how to update." => "%s 已經釋出，瞭解更多資訊以進行更新。",
 "Log out" => "登出",
 "Automatic logon rejected!" => "自動登入被拒！",
diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php
index fbcf4a87f22..9377de5d39a 100644
--- a/core/lostpassword/controller.php
+++ b/core/lostpassword/controller.php
@@ -8,8 +8,11 @@
 
 class OC_Core_LostPassword_Controller {
 	protected static function displayLostPasswordPage($error, $requested) {
+		$encrypted = OC_App::isEnabled('files_encryption');
 		OC_Template::printGuestPage('core/lostpassword', 'lostpassword',
-			array('error' => $error, 'requested' => $requested));
+			array('error' => $error,
+				'requested' => $requested,
+				'encrypted' => $encrypted));
 	}
 	
 	protected static function displayResetPasswordPage($success, $args) {
@@ -29,7 +32,14 @@ class OC_Core_LostPassword_Controller {
 	}
 
 	public static function sendEmail($args) {
-		if (OC_User::userExists($_POST['user'])) {
+
+		if(isset($_POST['noEncryption']) || isset($_POST['continue'])) {
+			$continue = true;
+		} else {
+			$continue = false;
+		}
+
+		if (OC_User::userExists($_POST['user']) && $continue) {
 			$token = hash('sha256', OC_Util::generate_random_bytes(30).OC_Config::getValue('passwordsalt', ''));
 			OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword',
 				hash('sha256', $token)); // Hash the token again to prevent timing attacks
diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
index c19c6893f13..c082ee977da 100644
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -17,6 +17,14 @@
 				<input type="text" name="user" id="user" placeholder="" value="" autocomplete="off" required autofocus />
 				<label for="user" class="infield"><?php print_unescaped($l->t( 'Username' )); ?></label>
 				<img class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/>
+				<?php if ($_['encrypted']): ?>
+				<br /><br />
+				<?php print_unescaped($l->t('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?')); ?><br />
+				<input type="checkbox" name="continue" value="Yes" />
+					<?php print_unescaped($l->t('Yes, I really want to reset my password now')); ?><br/><br/>
+				<?php else: ?>
+				<input type="checkbox" name="noEncryption" value="Yes" checked />
+				<?php endif; ?>
 			</p>
 			<input type="submit" id="submit" value="<?php print_unescaped($l->t('Request reset')); ?>" />
 		</fieldset>
diff --git a/core/templates/altmail.php b/core/templates/altmail.php
new file mode 100644
index 00000000000..37dc8eee942
--- /dev/null
+++ b/core/templates/altmail.php
@@ -0,0 +1,9 @@
+<?php
+print_unescaped($l->t("Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!", array($_['user_displayname'], $_['filename'], $_['link'])));
+?>
+
+--
+ownCloud - <?php
+print_unescaped($l->t("web services under your control"));
+?>
+http://ownCloud.org
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 336df27ef1c..163e8e3ae7e 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -6,7 +6,9 @@
 <!--[if gt IE 9]><html class="ng-csp ie"><![endif]-->
 <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]-->
 	<head>
-		<title>ownCloud</title>
+		<title>
+		<?php p(OC_Defaults::getName()); ?>
+		</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
 		<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" />
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index a3a8dc5f7ba..ba0147e6733 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -6,7 +6,9 @@
 <!--[if gt IE 9]><html class="ng-csp ie"><![endif]-->
 <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]-->
 	<head data-requesttoken="<?php p($_['requesttoken']); ?>">
-		<title>ownCloud</title>
+		<title>
+		<?php p(OC_Defaults::getName()); ?>
+		</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta name="apple-itunes-app" content="app-id=543672169">
 		<link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
@@ -33,10 +35,18 @@
 		<div id="login">
 			<header><div id="header">
 				<img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="ownCloud" />
+				<?php if (OC_Util::getEditionString() !== ''): ?>
+				<div id="logo-claim">Enterprise Edition</div>
+				<?php endif; ?>
 			</div></header>
 			<?php print_unescaped($_['content']); ?>
 		</div>
-		<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash;
-			<?php p($l->t( 'web services under your control' )); ?></p></footer>
+		<footer>
+			<p class="info">
+				<?php OC_Util::getEditionString() === '' ? '' : p('© 2013 '); ?>
+				<a href="<?php p(OC_Defaults::getBaseUrl())?>">
+					<?php  p(OC_Defaults::getEntity()); ?></a>
+				<?php OC_Util::getEditionString() === '' ? print_unescaped(' &ndash; ') : print_unescaped('<br/>'); ?>
+			<?php p(OC_Defaults::getSlogan()); ?></p></footer>
 	</body>
 </html>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index a3ebf3abd03..44ae4c6ca35 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -6,8 +6,11 @@
 <!--[if gt IE 9]><html class="ng-csp ie"><![endif]-->
 <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]-->
 	<head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>">
-		<title><?php p(!empty($_['application'])?$_['application'].' | ':'') ?>ownCloud
-			<?php p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?></title>
+		<title>
+			<?php p(!empty($_['application'])?$_['application'].' | ':'');
+			p(OC_Defaults::getName());
+			p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?>
+		</title>
 		<meta charset="utf-8">
 		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 		<meta name="apple-itunes-app" content="app-id=543672169">
@@ -40,7 +43,9 @@
 	<header><div id="header">
 			<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg"
 				src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="ownCloud" /></a>
-
+			<?php if (OC_Util::getEditionString() !== ''): ?>
+			<div id="logo-claim">Enterprise Edition</div>
+			<?php endif; ?>
 			<ul id="settings" class="svg">
 				<span id="expand" tabindex="0" role="link">
 					<span id="expandDisplayName"><?php  p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span>
diff --git a/core/templates/mail.php b/core/templates/mail.php
new file mode 100644
index 00000000000..ebeefd5c7e8
--- /dev/null
+++ b/core/templates/mail.php
@@ -0,0 +1,33 @@
+<table cellspacing="0" cellpadding="0" border="0" width="100%">
+<tr><td>
+<table cellspacing="0" cellpadding="0" border="0" width="600px">
+<tr>
+<td bgcolor="#1d2d44" width="20px">&nbsp;</td>
+<td bgcolor="#1d2d44">
+<img src="<?php print_unescaped(OC_Helper::makeURLAbsolute(image_path('', 'logo-mail.gif'))); ?>" alt="ownCloud"/>
+</td>
+</tr>
+<tr><td bgcolor="#f8f8f8" colspan="2">&nbsp;</td></tr>
+<tr>
+<td bgcolor="#f8f8f8" width="20px">&nbsp;</td>
+<td bgcolor="#f8f8f8" style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
+<?php
+print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href="%s">View it!</a><br><br>Cheers!', array($_['user_displayname'], $_['filename'], $_['link'])));
+?>
+</td>
+</tr>
+<tr><td bgcolor="#f8f8f8" colspan="2">&nbsp;</td></tr>
+<tr>
+<td bgcolor="#f8f8f8" width="20px">&nbsp;</td>
+<td bgcolor="#f8f8f8" style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
+ownCloud - <?php
+print_unescaped($l->t('web services under your control'));
+?>
+<br><a href="http://owncloud.org">http://ownCloud.org</a></td>
+</tr>
+<tr>
+<td bgcolor="#f8f8f8" colspan="2">&nbsp;</td>
+</tr>
+</table>
+</td></tr>
+</table>
diff --git a/cron.php b/cron.php
index 95cedf8bf4c..fbea7f26aed 100644
--- a/cron.php
+++ b/cron.php
@@ -44,75 +44,81 @@ function handleUnexpectedShutdown() {
 	}
 }
 
-require_once 'lib/base.php';
+try {
 
-session_write_close();
+	require_once 'lib/base.php';
 
-// Don't do anything if ownCloud has not been installed
-if (!OC_Config::getValue('installed', false)) {
-	exit(0);
-}
-
-// Handle unexpected errors
-register_shutdown_function('handleUnexpectedShutdown');
+	session_write_close();
 
-// Delete temp folder
-OC_Helper::cleanTmpNoClean();
-
-// Exit if background jobs are disabled!
-$appmode = OC_BackgroundJob::getExecutionType();
-if ($appmode == 'none') {
-	TemporaryCronClass::$sent = true;
-	if (OC::$CLI) {
-		echo 'Background Jobs are disabled!' . PHP_EOL;
-	} else {
-		OC_JSON::error(array('data' => array('message' => 'Background jobs disabled!')));
+	// Don't do anything if ownCloud has not been installed
+	if (!OC_Config::getValue('installed', false)) {
+		exit(0);
 	}
-	exit(1);
-}
 
-if (OC::$CLI) {
-	// Create lock file first
-	TemporaryCronClass::$lockfile = OC_Config::getValue("datadirectory", OC::$SERVERROOT . '/data') . '/cron.lock';
+	// Handle unexpected errors
+	register_shutdown_function('handleUnexpectedShutdown');
 
-	// We call ownCloud from the CLI (aka cron)
-	if ($appmode != 'cron') {
-		// Use cron in feature!
-		OC_BackgroundJob::setExecutionType('cron');
-	}
+	// Delete temp folder
+	OC_Helper::cleanTmpNoClean();
 
-	// check if backgroundjobs is still running
-	if (file_exists(TemporaryCronClass::$lockfile)) {
-		TemporaryCronClass::$keeplock = true;
+	// Exit if background jobs are disabled!
+	$appmode = OC_BackgroundJob::getExecutionType();
+	if ($appmode == 'none') {
 		TemporaryCronClass::$sent = true;
-		echo "Another instance of cron.php is still running!";
+		if (OC::$CLI) {
+			echo 'Background Jobs are disabled!' . PHP_EOL;
+		} else {
+			OC_JSON::error(array('data' => array('message' => 'Background jobs disabled!')));
+		}
 		exit(1);
 	}
 
-	// Create a lock file
-	touch(TemporaryCronClass::$lockfile);
+	if (OC::$CLI) {
+		// Create lock file first
+		TemporaryCronClass::$lockfile = OC_Config::getValue("datadirectory", OC::$SERVERROOT . '/data') . '/cron.lock';
 
-	// Work
-	$jobList = new \OC\BackgroundJob\JobList();
-	$jobs = $jobList->getAll();
-	foreach ($jobs as $job) {
-		$job->execute($jobList);
-	}
-} else {
-	// We call cron.php from some website
-	if ($appmode == 'cron') {
-		// Cron is cron :-P
-		OC_JSON::error(array('data' => array('message' => 'Backgroundjobs are using system cron!')));
-	} else {
-		// Work and success :-)
+		// We call ownCloud from the CLI (aka cron)
+		if ($appmode != 'cron') {
+			// Use cron in feature!
+			OC_BackgroundJob::setExecutionType('cron');
+		}
+
+		// check if backgroundjobs is still running
+		if (file_exists(TemporaryCronClass::$lockfile)) {
+			TemporaryCronClass::$keeplock = true;
+			TemporaryCronClass::$sent = true;
+			echo "Another instance of cron.php is still running!";
+			exit(1);
+		}
+
+		// Create a lock file
+		touch(TemporaryCronClass::$lockfile);
+
+		// Work
 		$jobList = new \OC\BackgroundJob\JobList();
-		$job = $jobList->getNext();
-		$job->execute($jobList);
-		$jobList->setLastJob($job);
-		OC_JSON::success();
+		$jobs = $jobList->getAll();
+		foreach ($jobs as $job) {
+			$job->execute($jobList);
+		}
+	} else {
+		// We call cron.php from some website
+		if ($appmode == 'cron') {
+			// Cron is cron :-P
+			OC_JSON::error(array('data' => array('message' => 'Backgroundjobs are using system cron!')));
+		} else {
+			// Work and success :-)
+			$jobList = new \OC\BackgroundJob\JobList();
+			$job = $jobList->getNext();
+			$job->execute($jobList);
+			$jobList->setLastJob($job);
+			OC_JSON::success();
+		}
 	}
-}
 
-// done!
-TemporaryCronClass::$sent = true;
-exit();
+	// done!
+	TemporaryCronClass::$sent = true;
+	exit();
+
+} catch (Exception $ex) {
+	\OCP\Util::writeLog('cron', $ex->getMessage(), \OCP\Util::FATAL);
+}
\ No newline at end of file
diff --git a/db_structure.xml b/db_structure.xml
index 933b09988f0..cefb7fc52c9 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -70,7 +70,7 @@
 				<name>id</name>
 				<type>text</type>
 				<default></default>
-				<notnull>true</notnull>
+				<notnull>false</notnull>
 				<length>64</length>
 			</field>
 
@@ -220,7 +220,7 @@
 				<name>path</name>
 				<type>text</type>
 				<default></default>
-				<notnull>true</notnull>
+				<notnull>false</notnull>
 				<length>512</length>
 			</field>
 
@@ -244,7 +244,7 @@
 				<name>name</name>
 				<type>text</type>
 				<default></default>
-				<notnull>true</notnull>
+				<notnull>false</notnull>
 				<length>250</length>
 			</field>
 
diff --git a/index.php b/index.php
index bf0b287a64b..a064aa5c76f 100755
--- a/index.php
+++ b/index.php
@@ -23,6 +23,15 @@
 
 $RUNTIME_NOAPPS = true; //no apps, yet
 
-require_once 'lib/base.php';
+try {
+	
+	require_once 'lib/base.php';
 
-OC::handleRequest();
+	OC::handleRequest();
+
+} 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);
+	OC_Template::printExceptionErrorPage($ex);
+}
\ No newline at end of file
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index 935097dcaed..103e03a9ca1 100644
--- a/l10n/af_ZA/core.po
+++ b/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 00:02+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 00:04+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"
@@ -19,26 +19,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -420,7 +401,19 @@ msgstr "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel."
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Herstel-versoek"
 
@@ -468,6 +461,21 @@ msgstr ""
 msgid "Cloud not found"
 msgstr "Wolk nie gevind"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "webdienste onder jou beheer"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -560,16 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr "Maak opstelling klaar"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "webdienste onder jou beheer"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Teken uit"
 
@@ -603,6 +607,13 @@ msgstr "Teken aan"
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "vorige"
diff --git a/l10n/af_ZA/files_encryption.po b/l10n/af_ZA/files_encryption.po
index 3ed16041c2e..d7026342595 100644
--- a/l10n/af_ZA/files_encryption.po
+++ b/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+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"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/af_ZA/files_sharing.po b/l10n/af_ZA/files_sharing.po
index 934d01cdeb9..5d42f316845 100644
--- a/l10n/af_ZA/files_sharing.po
+++ b/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-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:47+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+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"
@@ -42,7 +42,3 @@ msgstr ""
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "webdienste onder jou beheer"
diff --git a/l10n/af_ZA/lib.po b/l10n/af_ZA/lib.po
index 4c03f98e896..216f769e9fd 100644
--- a/l10n/af_ZA/lib.po
+++ b/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 00:02+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 00:04+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"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Hulp"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Persoonlik"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Instellings"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Gebruikers"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Toepassings"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Admin"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po
index 868778c6d74..abaa4467902 100644
--- a/l10n/af_ZA/settings.po
+++ b/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-05-25 02:02+0200\n"
-"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"POT-Creation-Date: 2013-06-11 01:57+0200\n"
+"PO-Revision-Date: 2013-06-10 23:57+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"
@@ -136,16 +136,16 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr ""
 
@@ -324,11 +324,11 @@ msgstr ""
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Wagwoord"
 
@@ -423,39 +423,39 @@ msgstr "Nuwe wagwoord"
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:56 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:71
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/af_ZA/user_webdavauth.po b/l10n/af_ZA/user_webdavauth.po
index 62bfbe01b34..cf6125d6053 100644
--- a/l10n/af_ZA/user_webdavauth.po
+++ b/l10n/af_ZA/user_webdavauth.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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+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"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index dc93bac616f..b7556553c2f 100644
--- a/l10n/ar/core.po
+++ b/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+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"
@@ -19,27 +19,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "المستخدم %s قام بمشاركة ملف معك"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "المستخدم  %s قام بمشاركة مجلد معك"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "المستخدم  %s  قام بمشاركة الملف  \"%s\"  معك . الملف متاح للتحميل من هنا : %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "المستخدم  %s  قام بمشاركة المجلد  \"%s\"  معك . المجلد متاح للتحميل من هنا : %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -392,7 +373,7 @@ msgstr "حصل خطأ في عملية التحديث, يرجى ارسال تقر
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud"
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "إعادة تعيين كلمة سر ownCloud"
 
@@ -420,7 +401,19 @@ msgstr "سوف نرسل لك بريد يحتوي على وصلة لتجديد ك
 msgid "Username"
 msgstr "إسم المستخدم"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "طلب تعديل"
 
@@ -468,6 +461,21 @@ msgstr "التوصّل محظور"
 msgid "Cloud not found"
 msgstr "لم يتم إيجاد"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "خدمات الشبكة تحت سيطرتك"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "عدل الفئات"
@@ -560,16 +568,12 @@ msgstr "خادم قاعدة البيانات"
 msgid "Finish setup"
 msgstr "انهاء التعديلات"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "خدمات الشبكة تحت سيطرتك"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "الخروج"
 
@@ -603,6 +607,13 @@ msgstr "أدخل"
 msgid "Alternative Logins"
 msgstr "اسماء دخول بديلة"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "السابق"
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 2dd51b6e687..b434ce6ef68 100644
--- a/l10n/ar/files.po
+++ b/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+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"
diff --git a/l10n/ar/files_encryption.po b/l10n/ar/files_encryption.po
index bcccd33c2f8..9c991385fd6 100644
--- a/l10n/ar/files_encryption.po
+++ b/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+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"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "جاري الحفظ..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "التشفير"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ar/files_external.po b/l10n/ar/files_external.po
index c5e4dfaf5be..0ad52f5d755 100644
--- a/l10n/ar/files_external.po
+++ b/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+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"
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index 89f61d6a703..c11f2cdbdaf 100644
--- a/l10n/ar/files_sharing.po
+++ b/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+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"
@@ -42,7 +42,3 @@ msgstr "تحميل"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "لا يوجد عرض مسبق لـ"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "خدمات الشبكة تحت سيطرتك"
diff --git a/l10n/ar/files_trashbin.po b/l10n/ar/files_trashbin.po
index 4efbb284b1f..beefc4ec294 100644
--- a/l10n/ar/files_trashbin.po
+++ b/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+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"
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index 530ac047011..c1d27d48e2a 100644
--- a/l10n/ar/lib.po
+++ b/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+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"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "المساعدة"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "شخصي"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "إعدادات"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "المستخدمين"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "التطبيقات"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "المدير"
 
@@ -113,76 +113,76 @@ msgstr "%s لا يسمح لك باستخدام نقطه (.) في اسم قاعد
 msgid "%s set the database host."
 msgstr "%s ادخل اسم خادم قاعدة البيانات"
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "اسم المستخدم / أو كلمة المرور الخاصة بـPostgreSQL غير صحيحة"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "انت بحاجة لكتابة اسم مستخدم موجود أو حساب المدير."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "اسم المستخدم  و/أو  كلمة المرور لنظام MySQL غير صحيح"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "خطأ في قواعد البيانات : \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "الأمر المخالف كان : \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "أسم المستخدم  '%s'@'localhost' الخاص بـ MySQL موجود مسبقا"
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "احذف اسم المستخدم هذا من الـ MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "أسم المستخدم  '%s'@'%%' الخاص بـ MySQL موجود مسبقا"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "احذف اسم المستخدم هذا من الـ MySQL."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "اسم المستخدم  و/أو  كلمة المرور لنظام Oracle غير صحيح"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "الأمر المخالف كان : \"%s\", اسم المستخدم : %s, كلمة المرور: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "اسم المستخدم  و/أو  كلمة المرور لنظام MS SQL غير صحيح : %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "اعدادات خادمك غير صحيحة بشكل تسمح لك بمزامنة ملفاتك وذلك بسبب أن واجهة WebDAV تبدو معطلة"
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>."
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index f4ef9800782..2cdbc4493aa 100644
--- a/l10n/ar/settings.po
+++ b/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+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"
@@ -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 "فشل إزالة المستخدم"
 
@@ -136,16 +136,16 @@ msgstr "تراجع"
 msgid "Unable to remove user"
 msgstr "تعذر حذف المستخدم"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "مجموعات"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "مدير المجموعة"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 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 "طوّر من قبل <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud مجتمع</a>, الـ <a href=\"https://github.com/owncloud\" target=\"_blank\">النص المصدري</a> مرخص بموجب <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">رخصة أفيرو العمومية</abbr></a>."
 
-#: 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 "راجع صفحة التطبيق على apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-ترخيص من قبل <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "حدث"
 
@@ -386,76 +386,76 @@ msgstr "تعقب علة"
 msgid "Commercial Support"
 msgstr "دعم تجاري"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "تم إستهلاك <strong>%s</strong> من المتوفر <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "احصل على التطبيقات لمزامنة ملفاتك"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "ابدأ خطوات بداية التشغيل من جديد"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "تم إستهلاك <strong>%s</strong> من المتوفر <strong>%s</strong>"
+
+#: 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:81
+#: 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 "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "إستخدم هذا العنوان للإتصال بـ ownCloud في مدير الملفات"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "اسم الدخول"
 
@@ -463,34 +463,40 @@ msgstr "اسم الدخول"
 msgid "Create"
 msgstr "انشئ"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "وحدة التخزين الافتراضية"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "غير محدود"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "شيء آخر"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "وحدة التخزين"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "تغيير اسم الحساب"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "اعداد كلمة مرور جديدة"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "افتراضي"
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index 184a1e448bc..3ae7b1ec2f6 100644
--- a/l10n/ar/user_ldap.po
+++ b/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+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"
diff --git a/l10n/ar/user_webdavauth.po b/l10n/ar/user_webdavauth.po
index 0b90ad151d9..fccc6ae2c32 100644
--- a/l10n/ar/user_webdavauth.po
+++ b/l10n/ar/user_webdavauth.po
@@ -10,8 +10,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+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"
@@ -25,8 +25,8 @@ msgid "WebDAV Authentication"
 msgstr "تأكد شخصية ال WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "الرابط: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/be/core.po b/l10n/be/core.po
index 5a28e4f3e46..5917b8f8bb7 100644
--- a/l10n/be/core.po
+++ b/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-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-14 23:59+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"
@@ -19,26 +19,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -216,23 +197,23 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr ""
 
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -420,7 +401,19 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr ""
 
@@ -468,6 +461,21 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr ""
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -560,16 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr "Завяршыць ўстаноўку."
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr ""
-
-#: templates/layout.user.php:36
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:61
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr ""
 
@@ -603,6 +607,13 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "Папярэдняя"
diff --git a/l10n/be/files_encryption.po b/l10n/be/files_encryption.po
index c0d6dac5727..d541fea8c42 100644
--- a/l10n/be/files_encryption.po
+++ b/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+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"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/be/files_sharing.po b/l10n/be/files_sharing.po
index b09ac51eb4d..ffe52589b39 100644
--- a/l10n/be/files_sharing.po
+++ b/l10n/be/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-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:47+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+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"
@@ -42,7 +42,3 @@ msgstr ""
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr ""
diff --git a/l10n/be/settings.po b/l10n/be/settings.po
index 77d13b3886c..3efffd109da 100644
--- a/l10n/be/settings.po
+++ b/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-05-25 02:02+0200\n"
-"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"POT-Creation-Date: 2013-06-11 01:57+0200\n"
+"PO-Revision-Date: 2013-06-10 23:57+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"
@@ -136,16 +136,16 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr ""
 
@@ -324,11 +324,11 @@ msgstr ""
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr ""
 
@@ -423,39 +423,39 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:56 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:71
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/be/user_webdavauth.po b/l10n/be/user_webdavauth.po
index 21fb9c8c465..34e6bd83127 100644
--- a/l10n/be/user_webdavauth.po
+++ b/l10n/be/user_webdavauth.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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+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"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 5375c222a00..e8157d68d02 100644
--- a/l10n/bg_BG/core.po
+++ b/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+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"
@@ -19,26 +19,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -420,7 +401,19 @@ msgstr "Ще получите връзка за нулиране на парол
 msgid "Username"
 msgstr "Потребител"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Нулиране на заявка"
 
@@ -468,6 +461,21 @@ msgstr "Достъпът е забранен"
 msgid "Cloud not found"
 msgstr "облакът не намерен"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "уеб услуги под Ваш контрол"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Редактиране на категориите"
@@ -560,16 +568,12 @@ msgstr "Хост за базата"
 msgid "Finish setup"
 msgstr "Завършване на настройките"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "уеб услуги под Ваш контрол"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Изход"
 
@@ -603,6 +607,13 @@ msgstr "Вход"
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "пред."
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 7ad91889b11..77588b9856d 100644
--- a/l10n/bg_BG/files.po
+++ b/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+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"
diff --git a/l10n/bg_BG/files_encryption.po b/l10n/bg_BG/files_encryption.po
index 9bc2e0ee7a6..4eef0288263 100644
--- a/l10n/bg_BG/files_encryption.po
+++ b/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+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"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Записване..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Криптиране"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/bg_BG/files_external.po b/l10n/bg_BG/files_external.po
index 0633f9ea966..c2f7261ee6b 100644
--- a/l10n/bg_BG/files_external.po
+++ b/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+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"
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index 6c1a66f1849..bc8c52dbefd 100644
--- a/l10n/bg_BG/files_sharing.po
+++ b/l10n/bg_BG/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+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"
@@ -42,7 +42,3 @@ msgstr "Изтегляне"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Няма наличен преглед за"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "уеб услуги под Ваш контрол"
diff --git a/l10n/bg_BG/files_trashbin.po b/l10n/bg_BG/files_trashbin.po
index 295bdf91f9a..5e0d5e94304 100644
--- a/l10n/bg_BG/files_trashbin.po
+++ b/l10n/bg_BG/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: Димитър Кръстев <dimitar.t.krastev@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po
index 9ee0cfa2851..d2410451f83 100644
--- a/l10n/bg_BG/lib.po
+++ b/l10n/bg_BG/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: Димитър Кръстев <dimitar.t.krastev@gmail.com>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Помощ"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Лични"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Настройки"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Потребители"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Приложения"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Админ"
 
@@ -114,76 +114,76 @@ msgstr "%s, не можете да ползвате точки в името н�
 msgid "%s set the database host."
 msgstr "%s задай хост на базата данни."
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Невалидно PostgreSQL потребителско име и/или парола"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Необходимо е да влезете в всъществуващ акаунт или като администратора"
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr "Oracle връзка не можа да се осъществи"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "Невалидно MySQL потребителско име и/или парола"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Грешка в базата от данни: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Проблемната команда беше: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL потребителят '%s'@'localhost' вече съществува"
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Изтриване на потребителя от MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL потребителят  '%s'@'%%' вече съществува."
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Изтриване на потребителя от MySQL."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Невалидно Oracle потребителско име и/или парола"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Проблемната команда беше: \"%s\", име: %s, парола: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Невалидно MS SQL потребителско име и/или парола: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Вашият web сървър все още не е удачно настроен да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Моля направете повторна справка с <a href='%s'>ръководството за инсталиране</a>."
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index a9564774535..ea1915953a5 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+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"
@@ -58,7 +58,7 @@ msgstr "Невалиден Email адрес"
 msgid "Unable to delete group"
 msgstr "Невъзможно изтриване на група"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Невъзможно изтриване на потребител"
 
@@ -136,16 +136,16 @@ msgstr "възтановяване"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Групи"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 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
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Покажи настройките за първоначално зареждане отново"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: 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:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Екранно име"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Вашия email адрес"
 
-#: 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 "WebDAV"
 
-#: 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:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Потребител"
 
@@ -463,34 +463,40 @@ msgstr "Потребител"
 msgid "Create"
 msgstr "Създаване"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Хранилище по подразбиране"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Неограничено"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Други"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Хранилище"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "По подразбиране"
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 2f6d617ab5b..d75efc118fb 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+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"
diff --git a/l10n/bg_BG/user_webdavauth.po b/l10n/bg_BG/user_webdavauth.po
index fb9b137fdff..3b2e883a618 100644
--- a/l10n/bg_BG/user_webdavauth.po
+++ b/l10n/bg_BG/user_webdavauth.po
@@ -8,9 +8,9 @@ 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:26+0000\n"
-"Last-Translator: Stefan Ilivanov <ilivanov@gmail.com>\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,8 +23,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV идентификация"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index 53062d9c8c4..3e32d3a390b 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "%s নামের ব্যবহারকারি আপনার সাথে একটা ফাইল ভাগাভাগি করেছেন"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "%s নামের ব্যবহারকারি আপনার সাথে একটা ফোল্ডার ভাগাভাগি করেছেন"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "%s নামের ব্যবহারকারী \"%s\" ফাইলটি আপনার সাথে ভাগাভাগি করেছেন। এটি এখন এখানে ডাউনলোড করার জন্য সুলভঃ %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "%s নামের ব্যবহারকারী \"%s\" ফোল্ডারটি আপনার সাথে ভাগাভাগি করেছেন। এটি এখন এখানে ডাউনলোড করার জন্য সুলভঃ %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "ownCloud কূটশব্দ পূনঃনির্ধারণ"
 
@@ -420,7 +401,19 @@ msgstr "কূটশব্দ পূনঃনির্ধারণের জন�
 msgid "Username"
 msgstr "ব্যবহারকারী"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "অনুরোধ পূনঃনির্ধারণ"
 
@@ -468,6 +461,21 @@ msgstr "অধিগমনের অনুমতি নেই"
 msgid "Cloud not found"
 msgstr "ক্লাউড খুঁজে পাওয়া গেল না"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "ওয়েব সার্ভিস আপনার হাতের মুঠোয়"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "ক্যাটেগরি সম্পাদনা"
@@ -560,16 +568,12 @@ msgstr "ডাটাবেজ হোস্ট"
 msgid "Finish setup"
 msgstr "সেটআপ সুসম্পন্ন কর"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "ওয়েব সার্ভিস আপনার হাতের মুঠোয়"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "প্রস্থান"
 
@@ -603,6 +607,13 @@ msgstr "প্রবেশ"
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "পূর্ববর্তী"
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index 046c1216b0a..7e855372cc8 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/files_encryption.po b/l10n/bn_BD/files_encryption.po
index 3b9c0439d51..f91cdf211a2 100644
--- a/l10n/bn_BD/files_encryption.po
+++ b/l10n/bn_BD/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "সংরক্ষণ করা হচ্ছে.."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "সংকেতায়ন"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/bn_BD/files_external.po b/l10n/bn_BD/files_external.po
index 2123c0223f3..0f351b2fe58 100644
--- a/l10n/bn_BD/files_external.po
+++ b/l10n/bn_BD/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/files_sharing.po b/l10n/bn_BD/files_sharing.po
index c9b40333ecc..942936ca66c 100644
--- a/l10n/bn_BD/files_sharing.po
+++ b/l10n/bn_BD/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "ডাউনলোড"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "এর জন্য কোন প্রাকবীক্ষণ সুলভ নয়"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "ওয়েব সার্ভিস আপনার হাতের মুঠোয়"
diff --git a/l10n/bn_BD/files_trashbin.po b/l10n/bn_BD/files_trashbin.po
index 4cd1399201b..80abfc9e661 100644
--- a/l10n/bn_BD/files_trashbin.po
+++ b/l10n/bn_BD/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/lib.po b/l10n/bn_BD/lib.po
index 7efba216d34..bed4b8da61a 100644
--- a/l10n/bn_BD/lib.po
+++ b/l10n/bn_BD/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "সহায়িকা"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "ব্যক্তিগত"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "নিয়ামকসমূহ"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "ব্যবহারকারী"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "অ্যাপ"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "প্রশাসন"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index 6c71a9e389e..1734f313ffb 100644
--- a/l10n/bn_BD/settings.po
+++ b/l10n/bn_BD/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\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 "ব্যবহারকারী মুছে ফেলা সম্ভব হলো না "
 
@@ -136,16 +136,16 @@ msgstr "ক্রিয়া প্রত্যাহার"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "গোষ্ঠীসমূহ"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "গোষ্ঠী প্রশাসক"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 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 "তৈলী করেছেন <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud সম্প্রদায়</a>, যার <a href=\"https://github.com/owncloud\" target=\"_blank\"> উৎস কোডটি <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> এর অধীনে লাইসেন্সকৃত।"
 
-#: 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 "apps.owncloud.com এ অ্যাপ্লিকেসন পৃষ্ঠা দেখুন"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-লাইসেন্সধারী <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "পরিবর্ধন"
 
@@ -386,76 +386,76 @@ msgstr "বাগট্র্যাকার"
 msgid "Commercial Support"
 msgstr "বাণিজ্যিক সাপোর্ট"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "আপনি ব্যবহার করছেন  <strong>%s</strong>, সুলভ  <strong>%s</strong> এর মধ্যে।"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "প্রথমবার চালানোর যাদুকর পূনরায় প্রদর্শন কর"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "আপনি ব্যবহার করছেন  <strong>%s</strong>, সুলভ  <strong>%s</strong> এর মধ্যে।"
+
+#: 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:81
+#: 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 "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "আপনার ownCloud এ সংযুক্ত হতে এই ঠিকানাটি আপনার ফাইল ব্যবস্থাপকে ব্যবহার করুন"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr "তৈরী কর"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "পূর্বনির্ধারিত সংরক্ষণাগার"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "অসীম"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "অন্যান্য"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "সংরক্ষণাগার"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "পূর্বনির্ধারিত"
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index cee6a266319..0ddbb185396 100644
--- a/l10n/bn_BD/user_ldap.po
+++ b/l10n/bn_BD/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bn_BD/user_webdavauth.po b/l10n/bn_BD/user_webdavauth.po
index 1768f6474f0..c4bf197ff78 100644
--- a/l10n/bn_BD/user_webdavauth.po
+++ b/l10n/bn_BD/user_webdavauth.po
@@ -8,8 +8,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL:http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/bs/core.po b/l10n/bs/core.po
new file mode 100644
index 00000000000..22c808424a8
--- /dev/null
+++ b/l10n/bs/core.po
@@ -0,0 +1,628 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ajax/share.php:97
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
+msgid "Category type not provided."
+msgstr ""
+
+#: ajax/vcategories/add.php:30
+msgid "No category to add?"
+msgstr ""
+
+#: ajax/vcategories/add.php:37
+#, php-format
+msgid "This category already exists: %s"
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
+#: ajax/vcategories/favorites.php:24
+#: ajax/vcategories/removeFromFavorites.php:26
+msgid "Object type not provided."
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:30
+#: ajax/vcategories/removeFromFavorites.php:30
+#, php-format
+msgid "%s ID not provided."
+msgstr ""
+
+#: ajax/vcategories/addToFavorites.php:35
+#, php-format
+msgid "Error adding %s to favorites."
+msgstr ""
+
+#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
+msgid "No categories selected for deletion."
+msgstr ""
+
+#: ajax/vcategories/removeFromFavorites.php:35
+#, php-format
+msgid "Error removing %s from favorites."
+msgstr ""
+
+#: js/config.php:34
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:35
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:36
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:37
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:38
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:39
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:40
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:45
+msgid "January"
+msgstr ""
+
+#: js/config.php:46
+msgid "February"
+msgstr ""
+
+#: js/config.php:47
+msgid "March"
+msgstr ""
+
+#: js/config.php:48
+msgid "April"
+msgstr ""
+
+#: js/config.php:49
+msgid "May"
+msgstr ""
+
+#: js/config.php:50
+msgid "June"
+msgstr ""
+
+#: js/config.php:51
+msgid "July"
+msgstr ""
+
+#: js/config.php:52
+msgid "August"
+msgstr ""
+
+#: js/config.php:53
+msgid "September"
+msgstr ""
+
+#: js/config.php:54
+msgid "October"
+msgstr ""
+
+#: js/config.php:55
+msgid "November"
+msgstr ""
+
+#: js/config.php:56
+msgid "December"
+msgstr ""
+
+#: js/js.js:286
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:718
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:719
+msgid "1 minute ago"
+msgstr ""
+
+#: js/js.js:720
+msgid "{minutes} minutes ago"
+msgstr ""
+
+#: js/js.js:721
+msgid "1 hour ago"
+msgstr ""
+
+#: js/js.js:722
+msgid "{hours} hours ago"
+msgstr ""
+
+#: js/js.js:723
+msgid "today"
+msgstr ""
+
+#: js/js.js:724
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:725
+msgid "{days} days ago"
+msgstr ""
+
+#: js/js.js:726
+msgid "last month"
+msgstr ""
+
+#: js/js.js:727
+msgid "{months} months ago"
+msgstr ""
+
+#: js/js.js:728
+msgid "months ago"
+msgstr ""
+
+#: js/js.js:729
+msgid "last year"
+msgstr ""
+
+#: js/js.js:730
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:117
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:122
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
+msgid "Error loading file picker template"
+msgstr ""
+
+#: js/oc-dialogs.js:164
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:172
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:185
+msgid "Ok"
+msgstr ""
+
+#: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
+#: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
+#: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
+#: js/oc-vcategories.js:172 js/oc-vcategories.js:189 js/oc-vcategories.js:195
+#: js/oc-vcategories.js:199 js/share.js:136 js/share.js:143 js/share.js:577
+#: js/share.js:589
+msgid "Error"
+msgstr ""
+
+#: js/oc-vcategories.js:179
+msgid "The app name is not specified."
+msgstr ""
+
+#: js/oc-vcategories.js:194
+msgid "The required file {file} is not installed!"
+msgstr ""
+
+#: js/share.js:30 js/share.js:45 js/share.js:87
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:90
+msgid "Share"
+msgstr "Podijeli"
+
+#: js/share.js:125 js/share.js:617
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:136
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:143
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:152
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:154
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:159
+msgid "Share with"
+msgstr ""
+
+#: js/share.js:164
+msgid "Share with link"
+msgstr ""
+
+#: js/share.js:167
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:169 templates/installation.php:54 templates/login.php:26
+msgid "Password"
+msgstr ""
+
+#: js/share.js:173
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:174
+msgid "Send"
+msgstr ""
+
+#: js/share.js:178
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:179
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:211
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:213
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:251
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:287
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:308
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:320
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:322
+msgid "access control"
+msgstr ""
+
+#: js/share.js:325
+msgid "create"
+msgstr ""
+
+#: js/share.js:328
+msgid "update"
+msgstr ""
+
+#: js/share.js:331
+msgid "delete"
+msgstr ""
+
+#: js/share.js:334
+msgid "share"
+msgstr ""
+
+#: js/share.js:368 js/share.js:564
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:577
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:589
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:604
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:615
+msgid "Email sent"
+msgstr ""
+
+#: js/update.js:14
+msgid ""
+"The update was unsuccessful. Please report this issue to the <a "
+"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
+"community</a>."
+msgstr ""
+
+#: js/update.js:18
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:58
+msgid "ownCloud password reset"
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:4
+msgid ""
+"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 ."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:12
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
+#: templates/login.php:19
+msgid "Username"
+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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
+msgid "Request reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr ""
+
+#: templates/edit_categories_dialog.php:16
+msgid "Add"
+msgstr "Dodaj"
+
+#: templates/installation.php:24 templates/installation.php:31
+#: templates/installation.php:38
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:25
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:26
+msgid "Please update your PHP installation to use ownCloud securely."
+msgstr ""
+
+#: templates/installation.php:32
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"Without a secure random number generator an attacker may be able to predict "
+"password reset tokens and take over your account."
+msgstr ""
+
+#: templates/installation.php:39
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:40
+msgid ""
+"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>."
+msgstr ""
+
+#: templates/installation.php:44
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:62
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:64
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:74
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:79 templates/installation.php:91
+#: templates/installation.php:102 templates/installation.php:113
+#: templates/installation.php:125
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:137
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:144
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:149
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:159
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:166
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:172
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.user.php:40
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:67
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:9
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:10
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:12
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:34
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:39
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:41
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:47
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr ""
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr ""
+
+#: templates/update.php:3
+#, php-format
+msgid "Updating ownCloud to version %s, this may take a while."
+msgstr ""
diff --git a/l10n/bs/files.po b/l10n/bs/files.po
new file mode 100644
index 00000000000..e13d674a9c2
--- /dev/null
+++ b/l10n/bs/files.po
@@ -0,0 +1,322 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/upload.php:19
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:26
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:27
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:29
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:30
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:31
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:32
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:33
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:51
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:83
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:12
+msgid "Files"
+msgstr ""
+
+#: js/fileactions.js:116
+msgid "Share"
+msgstr "Podijeli"
+
+#: js/fileactions.js:126
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
+msgid "Delete"
+msgstr ""
+
+#: js/fileactions.js:194
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:49 js/filelist.js:52 js/filelist.js:421
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:259 js/filelist.js:261
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/filelist.js:259 js/filelist.js:261
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:259
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:259 js/filelist.js:261
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:306
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
+
+#: js/filelist.js:306
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:331
+msgid "perform delete operation"
+msgstr ""
+
+#: js/filelist.js:413
+msgid "1 file uploading"
+msgstr ""
+
+#: js/filelist.js:416 js/filelist.js:470
+msgid "files uploading"
+msgstr ""
+
+#: js/files.js:52
+msgid "'.' is an invalid file name."
+msgstr ""
+
+#: js/files.js:56
+msgid "File name cannot be empty."
+msgstr ""
+
+#: js/files.js:64
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:231
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:264
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:277
+msgid "Not enough space available"
+msgstr ""
+
+#: js/files.js:317
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:413
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:486
+msgid "URL cannot be empty."
+msgstr ""
+
+#: js/files.js:491
+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
+msgid "Error"
+msgstr ""
+
+#: js/files.js:877 templates/index.php:69
+msgid "Name"
+msgstr "Ime"
+
+#: js/files.js:878 templates/index.php:80
+msgid "Size"
+msgstr "Veličina"
+
+#: js/files.js:879 templates/index.php:82
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:898
+msgid "1 folder"
+msgstr ""
+
+#: js/files.js:900
+msgid "{count} folders"
+msgstr ""
+
+#: js/files.js:908
+msgid "1 file"
+msgstr ""
+
+#: js/files.js:910
+msgid "{count} files"
+msgstr ""
+
+#: lib/app.php:53
+msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
+msgstr ""
+
+#: lib/app.php:73
+msgid "Unable to rename file"
+msgstr ""
+
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:15
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:20
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:22
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:26
+msgid "Save"
+msgstr "Spasi"
+
+#: templates/index.php:7
+msgid "New"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:12
+msgid "Folder"
+msgstr "Fasikla"
+
+#: templates/index.php:14
+msgid "From link"
+msgstr ""
+
+#: templates/index.php:42
+msgid "Deleted files"
+msgstr ""
+
+#: templates/index.php:48
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:54
+msgid "You don’t have write permissions here."
+msgstr ""
+
+#: templates/index.php:61
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:75
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:87 templates/index.php:88
+msgid "Unshare"
+msgstr ""
+
+#: templates/index.php:107
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:109
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:114
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:117
+msgid "Current scanning"
+msgstr ""
+
+#: templates/upgrade.php:2
+msgid "Upgrading filesystem cache..."
+msgstr ""
diff --git a/l10n/bs/files_encryption.po b/l10n/bs/files_encryption.po
new file mode 100644
index 00000000000..a93b63ecb96
--- /dev/null
+++ b/l10n/bs/files_encryption.po
@@ -0,0 +1,160 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-06-15 01:58+0200\n"
+"PO-Revision-Date: 2013-06-14 19:40+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "Spašavam..."
+
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:5 templates/settings-personal.php:4
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:10
+msgid ""
+"Enable encryption passwords recovery key (allow sharing to recovery key):"
+msgstr ""
+
+#: templates/settings-admin.php:14
+msgid "Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:34
+msgid "Change encryption passwords recovery key:"
+msgstr ""
+
+#: templates/settings-admin.php:41
+msgid "Old Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:48
+msgid "New Recovery account password"
+msgstr ""
+
+#: templates/settings-admin.php:53
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:63
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:64
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/bs/files_external.po b/l10n/bs/files_external.po
new file mode 100644
index 00000000000..631ae608baf
--- /dev/null
+++ b/l10n/bs/files_external.po
@@ -0,0 +1,123 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-06-13 02:16+0200\n"
+"PO-Revision-Date: 2013-06-12 21:41+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:65 js/google.js:66
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:101
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:36 js/google.js:93
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: lib/config.php:431
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:434
+msgid ""
+"<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."
+msgstr ""
+
+#: lib/config.php:437
+msgid ""
+"<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."
+msgstr ""
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:90
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:100
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:149 templates/settings.php:150
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:129
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:130
+msgid "Allow users to mount their own external storage"
+msgstr ""
+
+#: templates/settings.php:141
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:159
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/bs/files_sharing.po b/l10n/bs/files_sharing.po
new file mode 100644
index 00000000000..97a30ec7e14
--- /dev/null
+++ b/l10n/bs/files_sharing.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+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:48+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
+
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
+
+#: templates/public.php:10
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:13
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:19 templates/public.php:43
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:40
+msgid "No preview available for"
+msgstr ""
diff --git a/l10n/bs/files_trashbin.po b/l10n/bs/files_trashbin.po
new file mode 100644
index 00000000000..1136da20499
--- /dev/null
+++ b/l10n/bs/files_trashbin.po
@@ -0,0 +1,84 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ajax/delete.php:42
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:42
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/trash.js:7 js/trash.js:97
+msgid "perform restore operation"
+msgstr ""
+
+#: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
+msgid "Error"
+msgstr ""
+
+#: js/trash.js:34
+msgid "delete file permanently"
+msgstr ""
+
+#: js/trash.js:123
+msgid "Delete permanently"
+msgstr ""
+
+#: js/trash.js:176 templates/index.php:17
+msgid "Name"
+msgstr "Ime"
+
+#: js/trash.js:177 templates/index.php:27
+msgid "Deleted"
+msgstr ""
+
+#: js/trash.js:186
+msgid "1 folder"
+msgstr ""
+
+#: js/trash.js:188
+msgid "{count} folders"
+msgstr ""
+
+#: js/trash.js:196
+msgid "1 file"
+msgstr ""
+
+#: js/trash.js:198
+msgid "{count} files"
+msgstr ""
+
+#: templates/index.php:9
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:20 templates/index.php:22
+msgid "Restore"
+msgstr ""
+
+#: templates/index.php:30 templates/index.php:31
+msgid "Delete"
+msgstr ""
+
+#: templates/part.breadcrumb.php:9
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/bs/files_versions.po b/l10n/bs/files_versions.po
new file mode 100644
index 00000000000..221060a5ffd
--- /dev/null
+++ b/l10n/bs/files_versions.po
@@ -0,0 +1,57 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-06-13 02:16+0200\n"
+"PO-Revision-Date: 2013-06-12 21:41+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ajax/rollbackVersion.php:15
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: history.php:40
+msgid "success"
+msgstr ""
+
+#: history.php:42
+#, php-format
+msgid "File %s was reverted to version %s"
+msgstr ""
+
+#: history.php:49
+msgid "failure"
+msgstr ""
+
+#: history.php:51
+#, php-format
+msgid "File %s could not be reverted to version %s"
+msgstr ""
+
+#: history.php:69
+msgid "No old versions available"
+msgstr ""
+
+#: history.php:74
+msgid "No path specified"
+msgstr ""
+
+#: js/versions.js:6
+msgid "Versions"
+msgstr ""
+
+#: templates/history.php:20
+msgid "Revert a file to a previous version by clicking on its revert button"
+msgstr ""
diff --git a/l10n/bs/lib.po b/l10n/bs/lib.po
new file mode 100644
index 00000000000..91bc2323395
--- /dev/null
+++ b/l10n/bs/lib.po
@@ -0,0 +1,245 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-06-13 02:16+0200\n"
+"PO-Revision-Date: 2013-06-12 21:41+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: app.php:358
+msgid "Help"
+msgstr ""
+
+#: app.php:371
+msgid "Personal"
+msgstr ""
+
+#: app.php:382
+msgid "Settings"
+msgstr ""
+
+#: app.php:394
+msgid "Users"
+msgstr ""
+
+#: app.php:407
+msgid "Apps"
+msgstr ""
+
+#: app.php:415
+msgid "Admin"
+msgstr ""
+
+#: files.php:210
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:211
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:212 files.php:245
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:242
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: helper.php:236
+msgid "couldn't be determined"
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:62 json.php:73
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: search/provider/file.php:17 search/provider/file.php:35
+msgid "Files"
+msgstr ""
+
+#: search/provider/file.php:26 search/provider/file.php:33
+msgid "Text"
+msgstr ""
+
+#: search/provider/file.php:29
+msgid "Images"
+msgstr ""
+
+#: setup.php:34
+msgid "Set an admin username."
+msgstr ""
+
+#: setup.php:37
+msgid "Set an admin password."
+msgstr ""
+
+#: setup.php:55
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: setup.php:58
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: setup.php:61
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: setup.php:64
+#, php-format
+msgid "%s set the database host."
+msgstr ""
+
+#: setup.php:126 setup.php:323 setup.php:368
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:127 setup.php:232
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: setup.php:149
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: setup.php:231
+msgid "MySQL username and/or password not valid"
+msgstr ""
+
+#: setup.php:285 setup.php:389 setup.php:398 setup.php:416 setup.php:426
+#: setup.php:435 setup.php:468 setup.php:534 setup.php:560 setup.php:567
+#: setup.php:578 setup.php:585 setup.php:594 setup.php:602 setup.php:611
+#: setup.php:617
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: setup.php:286 setup.php:390 setup.php:399 setup.php:417 setup.php:427
+#: setup.php:436 setup.php:469 setup.php:535 setup.php:561 setup.php:568
+#: setup.php:579 setup.php:595 setup.php:603 setup.php:612
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: setup.php:302
+#, php-format
+msgid "MySQL user '%s'@'localhost' exists already."
+msgstr ""
+
+#: setup.php:303
+msgid "Drop this user from MySQL"
+msgstr ""
+
+#: setup.php:308
+#, php-format
+msgid "MySQL user '%s'@'%%' already exists"
+msgstr ""
+
+#: setup.php:309
+msgid "Drop this user from MySQL."
+msgstr ""
+
+#: setup.php:460 setup.php:527
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: setup.php:586 setup.php:618
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: setup.php:638
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: setup.php:861
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: setup.php:862
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: template.php:113
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:114
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:115
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:116
+msgid "1 hour ago"
+msgstr ""
+
+#: template.php:117
+#, php-format
+msgid "%d hours ago"
+msgstr ""
+
+#: template.php:118
+msgid "today"
+msgstr ""
+
+#: template.php:119
+msgid "yesterday"
+msgstr ""
+
+#: template.php:120
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:121
+msgid "last month"
+msgstr ""
+
+#: template.php:122
+#, php-format
+msgid "%d months ago"
+msgstr ""
+
+#: template.php:123
+msgid "last year"
+msgstr ""
+
+#: template.php:124
+msgid "years ago"
+msgstr ""
+
+#: vcategories.php:188 vcategories.php:249
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
diff --git a/l10n/bs/settings.po b/l10n/bs/settings.po
new file mode 100644
index 00000000000..28ed4328d56
--- /dev/null
+++ b/l10n/bs/settings.po
@@ -0,0 +1,502 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+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 19:40+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ajax/apps/ocs.php:20
+msgid "Unable to load list from App Store"
+msgstr ""
+
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your display name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change display name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/enableapp.php:11
+msgid "Could not enable app. "
+msgstr ""
+
+#: ajax/lostpassword.php:12
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:25
+msgid "Unable to delete user"
+msgstr ""
+
+#: ajax/setlanguage.php:15
+msgid "Language changed"
+msgstr ""
+
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
+msgstr ""
+
+#: ajax/togglegroups.php:30
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:36
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr ""
+
+#: js/apps.js:30
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:36 js/apps.js:76
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:36 js/apps.js:64 js/apps.js:83
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:55
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:90
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:93
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:96
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:118
+msgid "Saving..."
+msgstr "Spašavam..."
+
+#: js/users.js:47
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:47
+msgid "undo"
+msgstr ""
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:115 templates/users.php:164
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:269
+msgid "add group"
+msgstr ""
+
+#: js/users.js:428
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:429 js/users.js:435 js/users.js:450
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:434
+msgid "A valid password must be provided"
+msgstr ""
+
+#: personal.php:35 personal.php:36
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:15
+msgid "Security Warning"
+msgstr ""
+
+#: templates/admin.php:18
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/admin.php:29
+msgid "Setup Warning"
+msgstr ""
+
+#: templates/admin.php:32
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: templates/admin.php:33
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: templates/admin.php:47
+msgid ""
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
+"module to get best results with mime-type detection."
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:63
+#, php-format
+msgid ""
+"This ownCloud server can't set system locale to %s. This means that there "
+"might be problems with certain characters in file names. We strongly suggest"
+" to install the required packages on your system to support %s."
+msgstr ""
+
+#: templates/admin.php:75
+msgid "Internet connection not working"
+msgstr ""
+
+#: templates/admin.php:78
+msgid ""
+"This ownCloud server has no working internet connection. This means that "
+"some of the features like mounting of external storage, notifications about "
+"updates or installation of 3rd party apps don´t work. Accessing files from "
+"remote and sending of notification emails might also not work. We suggest to"
+" enable internet connection for this server if you want to have all features"
+" of ownCloud."
+msgstr ""
+
+#: templates/admin.php:92
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:101
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:111
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
+
+#: templates/admin.php:121
+msgid ""
+"Use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
+
+#: templates/admin.php:128
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:134
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:135
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:142
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:143
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:150
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:151
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:158
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:161
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:168
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:181
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:182
+msgid ""
+"Enforces the clients to connect to ownCloud via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:185
+msgid ""
+"Please connect to this ownCloud instance via HTTPS to enable or disable the "
+"SSL enforcement."
+msgstr ""
+
+#: templates/admin.php:195
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:196
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:227
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:228
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:235 templates/personal.php:116
+msgid "Version"
+msgstr ""
+
+#: 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 "
+"href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is "
+"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
+"target=\"_blank\"><abbr title=\"Affero General Public "
+"License\">AGPL</abbr></a>."
+msgstr ""
+
+#: templates/apps.php:13
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:28
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:33
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:39
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:41
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/apps.php:43
+msgid "Update"
+msgstr ""
+
+#: templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: templates/help.php:6
+msgid "Administrator Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Online Documentation"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Forum"
+msgstr ""
+
+#: templates/help.php:14
+msgid "Bugtracker"
+msgstr ""
+
+#: templates/help.php:17
+msgid "Commercial Support"
+msgstr ""
+
+#: 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:40 templates/users.php:23 templates/users.php:86
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:41
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:42
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:45
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:47
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:59 templates/users.php:85
+msgid "Display Name"
+msgstr ""
+
+#: templates/personal.php:74
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:76
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:77
+msgid "Fill in an email address to enable password recovery"
+msgstr ""
+
+#: templates/personal.php:86 templates/personal.php:87
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:99
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:105
+msgid "WebDAV"
+msgstr ""
+
+#: 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
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:30
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:36
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:48 templates/users.php:142
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:66 templates/users.php:157
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:91
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:102
+msgid "change display name"
+msgstr ""
+
+#: templates/users.php:106
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:137
+msgid "Default"
+msgstr ""
diff --git a/l10n/bs/user_ldap.po b/l10n/bs/user_ldap.po
new file mode 100644
index 00000000000..2d85a9f6eb8
--- /dev/null
+++ b/l10n/bs/user_ldap.po
@@ -0,0 +1,419 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2013-06-13 02:16+0200\n"
+"PO-Revision-Date: 2013-06-12 21:41+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:36
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:43
+msgid ""
+"The configuration is invalid. Please look in the ownCloud log for further "
+"details."
+msgstr ""
+
+#: js/settings.js:66
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:82
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:97
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:146
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:156
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:157
+msgid "Confirm Deletion"
+msgstr ""
+
+#: templates/settings.php:9
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:12
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:16
+msgid "Server configuration"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:40
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/settings.php:42
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:46
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:47
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:50
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:51
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:54
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:55
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:56
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:60
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:61
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:65
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:72
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:73
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:73
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:74
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:75
+msgid "When switched on, ownCloud will only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:76
+msgid "Do not use it additionally for LDAPS connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:77
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:78
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:78
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:78
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:79
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:79
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:81
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:83
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:83
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:84
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:84
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:85
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:85 templates/settings.php:88
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:86
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:86
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:89
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:93
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:94
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:94
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:95
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:96
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:96
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"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."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/settings.php:111
+msgid "Help"
+msgstr ""
diff --git a/l10n/bs/user_webdavauth.po b/l10n/bs/user_webdavauth.po
new file mode 100644
index 00000000000..93f72af7655
--- /dev/null
+++ b/l10n/bs/user_webdavauth.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+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-15 00:00+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: bs\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "URL: "
+msgstr ""
+
+#: templates/settings.php:7
+msgid ""
+"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."
+msgstr ""
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index dc1e99d35a7..596fa81c739 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
 "Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -21,27 +21,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "L'usuari %s ha compartit un fitxer amb vós"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "L'usuari %s ha compartit una carpeta amb vós"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "L'usuari %s ha compartit el fitxer \"%s\" amb vós. Està disponible per a la descàrrega a: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "L'usuari %s ha compartit la carpeta \"%s\" amb vós. Està disponible per a la descàrrega a: %s"
+msgid "%s shared »%s« with you"
+msgstr "%s ha compartit »%s« amb tu"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -394,7 +375,7 @@ msgstr "L'actualització ha estat incorrecte. Comuniqueu aquest error a <a href=
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "L'actualització ha estat correcte. Ara us redirigim a ownCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "estableix de nou la contrasenya Owncloud"
 
@@ -422,7 +403,19 @@ msgstr "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya."
 msgid "Username"
 msgstr "Nom d'usuari"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr "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?"
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "Sí, vull restablir ara la contrasenya"
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Sol·licita reinicialització"
 
@@ -470,6 +463,21 @@ msgstr "Accés prohibit"
 msgid "Cloud not found"
 msgstr "No s'ha trobat el núvol"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr "Ei,\n\nnomés fer-te saber que %s ha compartit %s amb tu.\nMira-ho: %s\n\nSalut!"
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "controleu els vostres serveis web"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Edita les categories"
@@ -562,16 +570,12 @@ msgstr "Ordinador central de la base de dades"
 msgid "Finish setup"
 msgstr "Acaba la configuració"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "controleu els vostres serveis web"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s està disponible. Obtingueu més informació de com actualitzar."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Surt"
 
@@ -605,6 +609,13 @@ msgstr "Inici de sessió"
 msgid "Alternative Logins"
 msgstr "Acreditacions alternatives"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr "Ei,<br><br>només fer-te saber que %s ha compartit %s amb tu.<br><a href=\"%s\">Mira-ho:</a><br><br>Salut!"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "anterior"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 7718d1fbc6b..2627e21034c 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ca/files_encryption.po b/l10n/ca/files_encryption.po
index ba235e5b616..6634d4057e5 100644
--- a/l10n/ca/files_encryption.po
+++ b/l10n/ca/files_encryption.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-08 02:03+0200\n"
-"PO-Revision-Date: 2013-06-07 09:23+0000\n"
+"POT-Creation-Date: 2013-06-16 01:58+0200\n"
+"PO-Revision-Date: 2013-06-15 21:10+0000\n"
 "Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -45,61 +45,118 @@ msgstr "La contrasenya s'ha canviat."
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr "No s'ha pogut canviar la contrasenya. Potser la contrasenya anterior no era correcta."
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr "La contrasenya de la clau privada s'ha actualitzat."
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr "No s'ha pogut actualitzar la contrasenya de la clau privada. Potser la contrasenya anterior no era correcta."
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr "La clau privada no és vàlida! Potser la contrasenya ha canviat des de fora. Podeu actualitzar la contrasenya de la clau privada a l'arranjament personal per obtenir de nou accés als vostres fitxers"
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Desant..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr "La vostra clau privada no és vàlida! Potser la vostra contrasenya ha canviat des de fora."
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr "Podeu desbloquejar la clau privada en el vostre"
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr "arranjament personal"
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Xifrat"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr "Activa la clau de recuperació de contrasenya (permet compartir la clau de recuperació):"
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr "Contrasenya de recuperació del compte"
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr "Activat"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr "Desactivat"
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr "Canvia la clau de recuperació de la contrasenya:"
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr "Contrasenya de recuperació anterior"
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr "Nova contrasenya de recuperació de compte"
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr "Canvia la contrasenya"
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
-msgstr "Activa la recuperació de contrasenya compartint tots els fitxers amb l'administrador:"
-
 #: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr "La clau privada ja no es correspon amb la contrasenya d'accés:"
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr "Establiu la vostra contrasenya clau en funció de la contrasenya actual d'accés."
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr "Si no recordeu la contrasenya anterior podeu demanar a l'administrador que recuperi els vostres fitxers."
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr "Contrasenya anterior d'accés"
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr "Contrasenya d'accés actual"
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr "Actualitza la contrasenya de clau privada"
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr "Habilita la recuperació de contrasenya:"
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
-msgstr "Activant aquesta opció us permetrà obtenir de nou accés als fitxers encriptats si perdeu la contrasenya"
+"files in case of password loss"
+msgstr "Activar aquesta opció us permetrà obtenir de nou accés als vostres fitxers encriptats en cas de perdre la contrasenya"
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr "S'han  actualitzat els arranjaments de recuperació de fitxers"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr "No s'ha pogut actualitzar la recuperació de fitxers"
diff --git a/l10n/ca/files_external.po b/l10n/ca/files_external.po
index 8e319607453..8e2160226e0 100644
--- a/l10n/ca/files_external.po
+++ b/l10n/ca/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index 890613baf05..6f80f22c204 100644
--- a/l10n/ca/files_sharing.po
+++ b/l10n/ca/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Baixa"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "No hi ha vista prèvia disponible per a"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "controleu els vostres serveis web"
diff --git a/l10n/ca/files_trashbin.po b/l10n/ca/files_trashbin.po
index 44af7f1e713..4b4a9918961 100644
--- a/l10n/ca/files_trashbin.po
+++ b/l10n/ca/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index b550849f94e..177bf871572 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Ajuda"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Configuració"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Usuaris"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Aplicacions"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Administració"
 
@@ -114,76 +114,76 @@ msgstr "%s no podeu usar punts en el nom de la base de dades"
 msgid "%s set the database host."
 msgstr "%s establiu l'ordinador central de la base de dades."
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nom d'usuari i/o contrasenya PostgreSQL no vàlids"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Heu d'escriure un compte existent o el d'administrador."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr "No s'ha pogut establir la connexió Oracle"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "Nom d'usuari i/o contrasenya MySQL no vàlids"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Error DB: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "L'ordre en conflicte és: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "L'usuari MySQL '%s'@'localhost' ja existeix."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Elimina aquest usuari de MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "L'usuari MySQL '%s'@'%%' ja existeix"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Elimina aquest usuari de MySQL."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Nom d'usuari i/o contrasenya Oracle no vàlids"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "L'ordre en conflicte és: \"%s\", nom: %s, contrasenya: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Nom d'usuari i/o contrasenya MS SQL no vàlids: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "El servidor web no està configurat correctament per permetre la sincronització de fitxers perquè la interfície WebDAV sembla no funcionar correctament."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Comproveu les <a href='%s'>guies d'instal·lació</a>."
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 1a92bdbc9dd..638442adba3 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -60,7 +60,7 @@ msgstr "El correu electrònic no és vàlid"
 msgid "Unable to delete group"
 msgstr "No es pot eliminar el grup"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "No es pot eliminar l'usuari"
 
@@ -138,16 +138,16 @@ msgstr "desfés"
 msgid "Unable to remove user"
 msgstr "No s'ha pogut eliminar l'usuari"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Grups"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Grup Admin"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Esborra"
 
@@ -326,11 +326,11 @@ msgstr "Més"
 msgid "Less"
 msgstr "Menys"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Versió"
 
-#: 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 "
@@ -340,27 +340,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> té llicència <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Afegiu la vostra aplicació"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Més aplicacions"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Seleccioneu una aplicació"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Mireu la pàgina d'aplicacions a apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-propietat de <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Actualitza"
 
@@ -388,76 +388,76 @@ msgstr "Seguiment d'errors"
 msgid "Commercial Support"
 msgstr "Suport comercial"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Heu utilitzat <strong>%s</strong> d'un total disponible de <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Obtén les aplicacions per sincronitzar fitxers"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Torna a mostrar l'assistent de primera execució"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Heu utilitzat <strong>%s</strong> d'un total disponible de <strong>%s</strong>"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Contrasenya"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "La seva contrasenya s'ha canviat"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "No s'ha pogut canviar la contrasenya"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Contrasenya actual"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Contrasenya nova"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Canvia la contrasenya"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Nom a mostrar"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Correu electrònic"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Ompliu el correu electrònic per activar la recuperació de contrasenya"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Ajudeu-nos amb la traducció"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Useu aquesta adreça per connectar amb ownCloud des del gestor de fitxers"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Nom d'accés"
 
@@ -465,34 +465,40 @@ msgstr "Nom d'accés"
 msgid "Create"
 msgstr "Crea"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr "Recuperació de contrasenya d'administrador"
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr "Escriviu la contrasenya de recuperació per a poder recuperar els fitxers dels usuaris en canviar la contrasenya"
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Emmagatzemament per defecte"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Il·limitat"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Un altre"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Emmagatzemament"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "canvia el nom a mostrar"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "estableix nova contrasenya"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Per defecte"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 8e8ba6de891..a9bf9278b78 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ca/user_webdavauth.po b/l10n/ca/user_webdavauth.po
index 66136ea54af..ca202c2dd79 100644
--- a/l10n/ca/user_webdavauth.po
+++ b/l10n/ca/user_webdavauth.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# rogerc, 2013
 # rogerc, 2012-2013
 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:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-16 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 21:00+0000\n"
+"Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,8 +24,8 @@ msgid "WebDAV Authentication"
 msgstr "Autenticació WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr "URL:"
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index ba2c7d9a2ae..6d77cbcb0a7 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
 "Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -21,27 +21,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "Uživatel %s s vámi sdílí soubor"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "Uživatel %s s vámi sdílí složku"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "Uživatel %s s vámi sdílí soubor \"%s\". Můžete jej stáhnout zde: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "Uživatel %s s vámi sdílí složku \"%s\". Můžete ji stáhnout zde: %s"
+msgid "%s shared »%s« with you"
+msgstr "%s s vámi sdílí »%s«"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -394,7 +375,7 @@ msgstr "Aktualizace neproběhla úspěšně. Nahlaste prosím problém do <a hre
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Aktualizace byla úspěšná. Přesměrovávám na ownCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "Obnovení hesla pro ownCloud"
 
@@ -422,7 +403,19 @@ msgstr "Bude Vám e-mailem zaslán odkaz pro obnovu hesla."
 msgid "Username"
 msgstr "Uživatelské jméno"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr "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?"
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "Ano, opravdu si nyní přeji obnovit své heslo"
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Vyžádat obnovu"
 
@@ -470,6 +463,21 @@ msgstr "Přístup zakázán"
 msgid "Cloud not found"
 msgstr "Cloud nebyl nalezen"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr "Ahoj,\n\njenom vám chci oznámit že %s s vámi sdílí %s.\nPodívat se můžete zde: %s\n\nDíky"
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "služby webu pod Vaší kontrolou"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Upravit kategorie"
@@ -562,16 +570,12 @@ msgstr "Hostitel databáze"
 msgid "Finish setup"
 msgstr "Dokončit nastavení"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "služby webu pod Vaší kontrolou"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s je dostupná. Získejte více informací k postupu aktualizace."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Odhlásit se"
 
@@ -605,6 +609,13 @@ msgstr "Přihlásit"
 msgid "Alternative Logins"
 msgstr "Alternativní přihlášení"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr "Ahoj,<br><br>jenom vám chci oznámit že %s s vámi sdílí %s.\nPodívat se můžete <br><a href=\"%s\">zde</a>.<br><br>Díky"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "předchozí"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index ba63540c302..7d4c0a8d62e 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po
index 3109e60cfd9..47c4307b1b7 100644
--- a/l10n/cs_CZ/files_encryption.po
+++ b/l10n/cs_CZ/files_encryption.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-08 02:03+0200\n"
-"PO-Revision-Date: 2013-06-07 13:50+0000\n"
+"POT-Creation-Date: 2013-06-15 01:58+0200\n"
+"PO-Revision-Date: 2013-06-14 19:40+0000\n"
 "Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -45,61 +45,118 @@ msgstr "Heslo bylo úspěšně změněno."
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr "Nelze změnit heslo. Pravděpodobně nebylo stávající heslo zadáno správně."
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr "Heslo soukromého klíče úspěšně aktualizováno."
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr "Nelze aktualizovat heslo soukromého klíče. Možná nebylo staré heslo správně."
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr "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"
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Ukládám..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Šifrování"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr "Povolit záchranný klíč šifrovacích hesel (povolí sdílený záchranný klíč):"
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr "Heslo pro obnovu účtu"
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr "Povoleno"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr "Zakázáno"
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr "Změnit záchranný klíč šifrovacích hesel:"
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr "Stávající heslo pro obnovu účtu"
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr "Nové heslo pro obnovu účtu"
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr "Změnit heslo"
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
-msgstr "Povolit obnovu hesla sdílením všech souborů s vaším správcem:"
-
 #: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr "Povolit obnovu hesla:"
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr "Povolení vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo"
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr "Možnosti obnovy souborů aktualizovány"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr "Nelze aktualizovat obnovu souborů"
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
index 689603626ff..de30f1170d6 100644
--- a/l10n/cs_CZ/files_external.po
+++ b/l10n/cs_CZ/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index 1d9b492d24c..0df7ac3b901 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Stáhnout"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Náhled není dostupný pro"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "služby webu pod Vaší kontrolou"
diff --git a/l10n/cs_CZ/files_trashbin.po b/l10n/cs_CZ/files_trashbin.po
index 2f57966e956..dbb756daba1 100644
--- a/l10n/cs_CZ/files_trashbin.po
+++ b/l10n/cs_CZ/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index 26ab19a9dee..8d4ae5ea7c0 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Nápověda"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Osobní"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Nastavení"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Uživatelé"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Aplikace"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Administrace"
 
@@ -114,76 +114,76 @@ msgstr "V názvu databáze %s nesmíte používat tečky."
 msgid "%s set the database host."
 msgstr "Zadejte název počítače s databází %s."
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Uživatelské jméno, či heslo PostgreSQL není platné"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Musíte zadat existující účet, či správce."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr "Spojení s Oracle nemohlo být navázáno"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "Uživatelské jméno, či heslo MySQL není platné"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Chyba DB: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Podezřelý příkaz byl: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Uživatel '%s'@'localhost' již v MySQL existuje."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Zahodit uživatele z MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Uživatel '%s'@'%%' již v MySQL existuje"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Zahodit uživatele z MySQL."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Uživatelské jméno, či heslo Oracle není platné"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Podezřelý příkaz byl: \"%s\", jméno: %s, heslo: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Uživatelské jméno, či heslo MSSQL není platné: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Váš webový server není správně nastaven pro umožnění synchronizace, protože rozhraní WebDAV je rozbité."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>."
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index d77b6f9fdf4..8108e7abb84 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -59,7 +59,7 @@ msgstr "Neplatný e-mail"
 msgid "Unable to delete group"
 msgstr "Nelze smazat skupinu"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Nelze smazat uživatele"
 
@@ -137,16 +137,16 @@ msgstr "zpět"
 msgid "Unable to remove user"
 msgstr "Nelze odebrat uživatele"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Skupiny"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Správa skupiny"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Smazat"
 
@@ -325,11 +325,11 @@ msgstr "Více"
 msgid "Less"
 msgstr "Méně"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Verze"
 
-#: 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 "
@@ -339,27 +339,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencován pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Přidat Vaší aplikaci"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Více aplikací"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Vyberte aplikaci"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Více na stránce s aplikacemi na apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licencováno <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Aktualizovat"
 
@@ -387,76 +387,76 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Placená podpora"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Používáte <strong>%s</strong> z <strong>%s</strong> dostupných"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Získat aplikace pro synchronizaci vašich souborů"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Znovu zobrazit průvodce prvním spuštěním"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Používáte <strong>%s</strong> z <strong>%s</strong> dostupných"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Vaše heslo bylo změněno"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Vaše heslo nelze změnit"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Současné heslo"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nové heslo"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Změnit heslo"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Zobrazované jméno"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Vaše e-mailová adresa"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Pro povolení změny hesla vyplňte adresu e-mailu"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Jazyk"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Pomoci s překladem"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Použijte tuto adresu pro připojení k vašemu ownCloud skrze správce souborů"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Přihlašovací jméno"
 
@@ -464,34 +464,40 @@ msgstr "Přihlašovací jméno"
 msgid "Create"
 msgstr "Vytvořit"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr "Heslo obnovy správce"
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesla"
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Výchozí úložiště"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Neomezeně"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Jiný"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Úložiště"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "změnit zobrazované jméno"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "nastavit nové heslo"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Výchozí"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 68c8e1e7aff..a040da8991e 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/cs_CZ/user_webdavauth.po b/l10n/cs_CZ/user_webdavauth.po
index 420758436b0..8e151213057 100644
--- a/l10n/cs_CZ/user_webdavauth.po
+++ b/l10n/cs_CZ/user_webdavauth.po
@@ -8,8 +8,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "WebDAV Authentication"
 msgstr "Ověření WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index 2220311fc29..f325280db0c 100644
--- a/l10n/cy_GB/core.po
+++ b/l10n/cy_GB/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
-"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,27 +20,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "Rhannodd defnyddiwr %s ffeil â chi"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "Rhannodd defnyddiwr %s blygell â chi"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "Rhannodd defnyddiwr %s ffeil \"%s\" â chi. Gellir ei llwytho lawr o fan hyn: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "Rhannodd defnyddiwr %s blygell \"%s\" â chi. Gellir ei llwytho lawr o fan hyn: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -393,7 +374,7 @@ msgstr "Methodd y diweddariad. Adroddwch y mater hwn i <a href=\"https://github.
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "ailosod cyfrinair ownCloud"
 
@@ -421,7 +402,19 @@ msgstr "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair."
 msgid "Username"
 msgstr "Enw defnyddiwr"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Gwneud cais i ailosod"
 
@@ -469,6 +462,21 @@ msgstr "Mynediad wedi'i wahardd"
 msgid "Cloud not found"
 msgstr "Methwyd canfod cwmwl"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "gwasanaethau gwe a reolir gennych"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Golygu categorïau"
@@ -561,16 +569,12 @@ msgstr "Gwesteiwr cronfa ddata"
 msgid "Finish setup"
 msgstr "Gorffen sefydlu"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "gwasanaethau gwe a reolir gennych"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s ar gael. Mwy o wybodaeth am sut i ddiweddaru."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Allgofnodi"
 
@@ -604,6 +608,13 @@ msgstr "Mewngofnodi"
 msgid "Alternative Logins"
 msgstr "Mewngofnodiadau Amgen"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "blaenorol"
diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po
index ec920838746..2b4ed6bc2e2 100644
--- a/l10n/cy_GB/files.po
+++ b/l10n/cy_GB/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/files_encryption.po b/l10n/cy_GB/files_encryption.po
index 7cd6f45cb5f..961b47b4105 100644
--- a/l10n/cy_GB/files_encryption.po
+++ b/l10n/cy_GB/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -44,61 +44,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Yn cadw..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Amgryptiad"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/cy_GB/files_external.po b/l10n/cy_GB/files_external.po
index 3dcb482644e..bbd6b29c6b4 100644
--- a/l10n/cy_GB/files_external.po
+++ b/l10n/cy_GB/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/files_sharing.po b/l10n/cy_GB/files_sharing.po
index 89548ee5f91..cf65ee9c3ac 100644
--- a/l10n/cy_GB/files_sharing.po
+++ b/l10n/cy_GB/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,7 +42,3 @@ msgstr "Llwytho i lawr"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Does dim rhagolwg ar gael ar gyfer"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "gwasanaethau gwe a reolir gennych"
diff --git a/l10n/cy_GB/files_trashbin.po b/l10n/cy_GB/files_trashbin.po
index 15f6d4ee2a2..9ab1d6dd21d 100644
--- a/l10n/cy_GB/files_trashbin.po
+++ b/l10n/cy_GB/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/lib.po b/l10n/cy_GB/lib.po
index 16149fb3e5f..0b3e1bda1c5 100644
--- a/l10n/cy_GB/lib.po
+++ b/l10n/cy_GB/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: cy_GB\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Cymorth"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Personol"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Defnyddwyr"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Pecynnau"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Gweinyddu"
 
@@ -113,76 +113,76 @@ msgstr "%s does dim hawl defnyddio dot yn enw'r gronfa ddata"
 msgid "%s set the database host."
 msgstr "%s gosod gwesteiwr y gronfa ddata."
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Enw a/neu gyfrinair PostgreSQL annilys"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Rhaid i chi naill ai gyflwyno cyfrif presennol neu'r gweinyddwr."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "Enw a/neu gyfrinair MySQL annilys"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Gwall DB: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Defnyddiwr MySQL '%s'@'localhost' yn bodoli eisoes."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Gollwng y defnyddiwr hwn o MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Defnyddiwr MySQL '%s'@'%%' eisoes yn bodoli"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Gollwng y defnyddiwr hwn o MySQL."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Enw a/neu gyfrinair Oracle annilys"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\", enw: %s, cyfrinair: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Enw a/neu gyfrinair MS SQL annilys: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto."
diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po
index 584081f7c5d..696ba1f5a84 100644
--- a/l10n/cy_GB/settings.po
+++ b/l10n/cy_GB/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\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 ""
 
@@ -136,16 +136,16 @@ msgstr "dadwneud"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Grwpiau"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Dileu"
 
@@ -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
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Cyfrinair"
 
-#: 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 "Cyfrinair newydd"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "E-bost"
 
-#: 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:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Arall"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po
index d26988e8fb0..31a18c2cc70 100644
--- a/l10n/cy_GB/user_ldap.po
+++ b/l10n/cy_GB/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/cy_GB/user_webdavauth.po b/l10n/cy_GB/user_webdavauth.po
index 2f567efac8e..d034799f188 100644
--- a/l10n/cy_GB/user_webdavauth.po
+++ b/l10n/cy_GB/user_webdavauth.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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/da/core.po b/l10n/da/core.po
index e41352ec868..89b1611e620 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ole Holm Frandsen <froksen@gmail.com>, 2013
 # Peter Jespersen <flywheeldk@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: Peter Jespersen <flywheeldk@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,27 +21,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "Bruger %s delte en fil med dig"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "Bruger %s delte en mappe med dig"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "Bruger %s delte filen \"%s\" med dig. Den kan hentes her: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "Bruger %s delte mappe \"%s\" med dig. Det kan hentes her: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -223,7 +205,7 @@ msgstr "Annuller"
 
 #: js/oc-dialogs.js:141 js/oc-dialogs.js:200
 msgid "Error loading file picker template"
-msgstr ""
+msgstr "Fejl ved indlæsning af filvælger skabelon"
 
 #: js/oc-dialogs.js:164
 msgid "Yes"
@@ -393,7 +375,7 @@ msgstr "Opdateringen blev ikke udført korrekt. Rapporter venligst problemet til
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "Nulstil ownCloud kodeord"
 
@@ -421,7 +403,19 @@ msgstr "Du vil modtage et link til at nulstille dit kodeord via email."
 msgid "Username"
 msgstr "Brugernavn"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Anmod om nulstilling"
 
@@ -469,6 +463,21 @@ msgstr "Adgang forbudt"
 msgid "Cloud not found"
 msgstr "Sky ikke fundet"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "Webtjenester under din kontrol"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Rediger kategorier"
@@ -561,16 +570,12 @@ msgstr "Databasehost"
 msgid "Finish setup"
 msgstr "Afslut opsætning"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "Webtjenester under din kontrol"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s er tilgængelig. Få mere information om, hvordan du opdaterer."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Log ud"
 
@@ -604,6 +609,13 @@ msgstr "Log ind"
 msgid "Alternative Logins"
 msgstr "Alternative logins"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "forrige"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index ff5b7a21224..6e6d862f456 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ole Holm Frandsen <froksen@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: Ole Holm Frandsen <froksen@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -217,7 +218,7 @@ msgstr "{count} filer"
 
 #: lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Ugyldigt mappenavn. Brug af 'Shared' er forbeholdt af ownCloud"
 
 #: lib/app.php:73
 msgid "Unable to rename file"
diff --git a/l10n/da/files_encryption.po b/l10n/da/files_encryption.po
index 49b772ef5d4..9a0323a6c10 100644
--- a/l10n/da/files_encryption.po
+++ b/l10n/da/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Gemmer..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po
index 8ccff72965d..8b03cf6826f 100644
--- a/l10n/da/files_external.po
+++ b/l10n/da/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index 7bc46e34ad9..56efb331469 100644
--- a/l10n/da/files_sharing.po
+++ b/l10n/da/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Download"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Forhåndsvisning ikke tilgængelig for"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "Webtjenester under din kontrol"
diff --git a/l10n/da/files_trashbin.po b/l10n/da/files_trashbin.po
index 494218876b7..0f0890fcc99 100644
--- a/l10n/da/files_trashbin.po
+++ b/l10n/da/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index 8e123f9887a..780b49f9ade 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ole Holm Frandsen <froksen@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"Last-Translator: Ole Holm Frandsen <froksen@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,27 +18,27 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Hjælp"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Personligt"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Brugere"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Admin"
 
@@ -113,76 +114,76 @@ msgstr "%s du må ikke bruge punktummer i databasenavnet."
 msgid "%s set the database host."
 msgstr "%s sæt database værten."
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL brugernavn og/eller kodeord er ikke gyldigt."
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Du bliver nødt til at indtaste en eksisterende bruger eller en administrator."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
-msgstr ""
+msgstr "Oracle forbindelsen kunne ikke etableres"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL brugernavn og/eller kodeord er ikke gyldigt."
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Databasefejl: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Fejlende kommando var: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL brugeren '%s'@'localhost' eksisterer allerede."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Slet denne bruger fra MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL brugeren '%s'@'%%' eksisterer allerede."
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Slet denne bruger fra MySQL"
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle brugernavn og/eller kodeord er ikke gyldigt."
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Fejlende kommando var: \"%s\", navn: %s, password: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL brugernavn og/eller adgangskode ikke er gyldigt: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>."
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 490f51b2736..78247c20d08 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: Ole Holm Frandsen <froksen@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,7 +59,7 @@ msgstr "Ugyldig email adresse"
 msgid "Unable to delete group"
 msgstr "Gruppen kan ikke slettes"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Bruger kan ikke slettes"
 
@@ -137,16 +137,16 @@ msgstr "fortryd"
 msgid "Unable to remove user"
 msgstr "Kan ikke fjerne bruger"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Grupper"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Gruppe Administrator"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Slet"
 
@@ -325,11 +325,11 @@ msgstr "Mere"
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Version"
 
-#: 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 "
@@ -339,27 +339,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Udviklet af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownClouds community</a>, og <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er underlagt licensen <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Tilføj din App"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Flere Apps"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Vælg en App"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Se applikationens side på apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenseret af <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Opdater"
 
@@ -387,76 +387,76 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Kommerciel support"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Du har brugt <strong>%s</strong> af den tilgængelige <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Hent applikationerne for at synkronisere dine filer"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Vis Første Kørsels Guiden igen."
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Du har brugt <strong>%s</strong> af den tilgængelige <strong>%s</strong>"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Kodeord"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Din adgangskode blev ændret"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Ude af stand til at ændre dit kodeord"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Nuværende adgangskode"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nyt kodeord"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Skift kodeord"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Skærmnavn"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Din emailadresse"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Indtast en emailadresse for at kunne få påmindelse om adgangskode"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Sprog"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Hjælp med oversættelsen"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Brug denne adresse til at oprette forbindelse til din ownCloud i din filstyring"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Loginnavn"
 
@@ -464,34 +464,40 @@ msgstr "Loginnavn"
 msgid "Create"
 msgstr "Ny"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
-msgstr ""
+msgstr "Administrator gendannelse kodeord"
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr "Indtast et gendannelse kodeord for, at kunne gendanne brugerens filer ved ændring af kodeord"
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Standard opbevaring"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Ubegrænset"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Andet"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Opbevaring"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "skift skærmnavn"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "skift kodeord"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Standard"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 13c7c8fcf89..6cbcfa142ee 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/da/user_webdavauth.po b/l10n/da/user_webdavauth.po
index 9c0bc594ab8..5a46dae8fe2 100644
--- a/l10n/da/user_webdavauth.po
+++ b/l10n/da/user_webdavauth.po
@@ -9,8 +9,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV-godkendelse"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 9d9ae24c675..2dce2331274 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
-"Last-Translator: ninov <ninovdl@ymail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,27 +23,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "Der Nutzer %s hat eine Datei mit Dir geteilt"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "%s hat ein Verzeichnis mit Dir geteilt"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "%s hat die Datei \"%s\" mit Dir geteilt. Sie ist hier zum Download verfügbar: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "%s hat den Ordner \"%s\" mit Dir geteilt. Er ist hier zum Download verfügbar: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -396,7 +377,7 @@ msgstr "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die <a href
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "ownCloud-Passwort zurücksetzen"
 
@@ -424,7 +405,19 @@ msgstr "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen."
 msgid "Username"
 msgstr "Benutzername"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Beantrage Zurücksetzung"
 
@@ -472,6 +465,21 @@ msgstr "Zugriff verboten"
 msgid "Cloud not found"
 msgstr "Cloud nicht gefunden"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "Web-Services unter Deiner Kontrolle"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Kategorien bearbeiten"
@@ -564,16 +572,12 @@ msgstr "Datenbank-Host"
 msgid "Finish setup"
 msgstr "Installation abschließen"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "Web-Services unter Deiner Kontrolle"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Abmelden"
 
@@ -607,6 +611,13 @@ msgstr "Einloggen"
 msgid "Alternative Logins"
 msgstr "Alternative Logins"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "Zurück"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index cf950694d9e..2f836f144ac 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: ninov <ninovdl@ymail.com>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de/files_encryption.po b/l10n/de/files_encryption.po
index 90339bb580a..359fa3145d5 100644
--- a/l10n/de/files_encryption.po
+++ b/l10n/de/files_encryption.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-08 02:03+0200\n"
-"PO-Revision-Date: 2013-06-07 09:23+0000\n"
-"Last-Translator: ninov <ninovdl@ymail.com>\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,61 +46,118 @@ msgstr "Dein Passwort wurde geändert."
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch."
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Speichern..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr "Password zurücksetzen"
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr "Wiederherstellungsschlüssel für Passwörter ändern:"
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
-msgstr "Wenn Sie diese Einstellung aktivieren, können Sie auch im Falle des Verlustes Ihres Passworts auf verschlüsselte Dateien zugreifen"
+"files in case of password loss"
+msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index 003024ac2c0..f7357b958b1 100644
--- a/l10n/de/files_external.po
+++ b/l10n/de/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index 6bdad062259..edc1560704a 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,7 +42,3 @@ msgstr "Download"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Es ist keine Vorschau verfügbar für"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "Web-Services unter Deiner Kontrolle"
diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po
index aa4e28f2cd7..140e3ebea4e 100644
--- a/l10n/de/files_trashbin.po
+++ b/l10n/de/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index 684e63fcdf7..71e452b0748 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: ninov <ninovdl@ymail.com>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,27 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Hilfe"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Persönlich"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Benutzer"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Administration"
 
@@ -115,76 +115,76 @@ msgstr "%s Der Datenbank-Name darf keine Punkte enthalten"
 msgid "%s set the database host."
 msgstr "%s setze den Datenbank-Host"
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL Benutzername und/oder Passwort ungültig"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Du musst entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr "Es konnte keine Verbindung zur Oracle-Datenbank hergestellt werden"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL Benutzername und/oder Passwort ungültig"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB Fehler: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Fehlerhafter Befehl war: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Lösche diesen Benutzer von MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL Benutzer '%s'@'%%' existiert bereits"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Lösche diesen Benutzer aus MySQL."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle Benutzername und/oder Passwort ungültig"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL Benutzername und/oder Password ungültig: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>."
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 0198447f48a..05048e2a0aa 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: ninov <ninovdl@ymail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -61,7 +61,7 @@ msgstr "Ungültige E-Mail Adresse"
 msgid "Unable to delete group"
 msgstr "Gruppe konnte nicht gelöscht werden"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Benutzer konnte nicht gelöscht werden"
 
@@ -139,16 +139,16 @@ msgstr "rückgängig machen"
 msgid "Unable to remove user"
 msgstr "Benutzer konnte nicht entfernt werden."
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Gruppen"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Gruppenadministrator"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Löschen"
 
@@ -327,11 +327,11 @@ msgstr "Mehr"
 msgid "Less"
 msgstr "Weniger"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Version"
 
-#: 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 "
@@ -341,27 +341,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Füge Deine Anwendung hinzu"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Weitere Anwendungen"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Wähle eine Anwendung aus"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Weitere Anwendungen findest Du auf apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Aktualisierung durchführen"
 
@@ -389,76 +389,76 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Kommerzieller Support"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s<strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Lade die Apps zur Synchronisierung Deiner Daten herunter"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Erstinstallation erneut durchführen"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s<strong>"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Dein Passwort wurde geändert."
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Passwort konnte nicht geändert werden"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Aktuelles Passwort"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Anzeigename"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "E-Mail"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Deine E-Mail-Adresse"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Sprache"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Hilf bei der Übersetzung"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Verwende diese Adresse, um Deinen Dateimanager mit Deiner ownCloud zu verbinden"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Loginname"
 
@@ -466,34 +466,40 @@ msgstr "Loginname"
 msgid "Create"
 msgstr "Anlegen"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr "Admin-Wiederherstellungspasswort"
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Standard-Speicher"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Unbegrenzt"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Andere"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Speicher"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "Anzeigenamen ändern"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "Neues Passwort setzen"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Standard"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index 6de01c006e6..92ec6d522eb 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de/user_webdavauth.po b/l10n/de/user_webdavauth.po
index ff18551f627..47b68e0fd1f 100644
--- a/l10n/de/user_webdavauth.po
+++ b/l10n/de/user_webdavauth.po
@@ -11,8 +11,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV Authentifikation"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index d6c7f97f3c0..3e248ad6de2 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
-"Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,27 +23,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "Der Nutzer %s hat eine Datei mit Ihnen geteilt"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "%s hat einen Ordner mit Ihnen geteilt"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "%s hat die Datei \"%s\" mit Ihnen geteilt. Sie ist hier zum Download verfügbar: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "%s hat den Ordner \"%s\" mit Ihnen geteilt. Er ist hier zum Download verfügbar: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -396,7 +377,7 @@ msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "ownCloud-Passwort zurücksetzen"
 
@@ -424,7 +405,19 @@ msgstr "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen."
 msgid "Username"
 msgstr "Benutzername"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Zurücksetzung anfordern"
 
@@ -472,6 +465,21 @@ msgstr "Zugriff verboten"
 msgid "Cloud not found"
 msgstr "Cloud wurde nicht gefunden"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "Web-Services unter Ihrer Kontrolle"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Kategorien ändern"
@@ -564,16 +572,12 @@ msgstr "Datenbank-Host"
 msgid "Finish setup"
 msgstr "Installation abschließen"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "Web-Services unter Ihrer Kontrolle"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Abmelden"
 
@@ -607,6 +611,13 @@ msgstr "Einloggen"
 msgid "Alternative Logins"
 msgstr "Alternative Logins"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "Zurück"
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index d06e7c6d8a6..683daa1864c 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: a.tangemann <a.tangemann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/files_encryption.po b/l10n/de_DE/files_encryption.po
index 6b74b97fd54..b7d0b1cd73b 100644
--- a/l10n/de_DE/files_encryption.po
+++ b/l10n/de_DE/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 10:16+0000\n"
-"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,61 +45,118 @@ msgstr "Das Passwort wurde erfolgreich geändert."
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig."
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Speichern..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr "Account-Passwort wiederherstellen"
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr "Altes Passwort für die Account-Wiederherstellung"
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr "Neues Passwort für die Account-Wiederherstellung"
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
-msgstr "Aktiviere die Wiederherstellung deines Passwortes durch das Teilen aller Dateien mit dem Administrator:"
-
 #: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
-msgstr "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben."
+"files in case of password loss"
+msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert."
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr "Die Dateiwiederherstellung konnte nicht aktualisiert werden."
diff --git a/l10n/de_DE/files_external.po b/l10n/de_DE/files_external.po
index e88d0f48c0c..664bd0ff884 100644
--- a/l10n/de_DE/files_external.po
+++ b/l10n/de_DE/files_external.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/files_sharing.po b/l10n/de_DE/files_sharing.po
index 962ad5c70be..0d635d2140d 100644
--- a/l10n/de_DE/files_sharing.po
+++ b/l10n/de_DE/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,7 +42,3 @@ msgstr "Herunterladen"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Es ist keine Vorschau verfügbar für"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "Web-Services unter Ihrer Kontrolle"
diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po
index 9767fc045b0..85ef60ecf80 100644
--- a/l10n/de_DE/files_trashbin.po
+++ b/l10n/de_DE/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index 0708fa2b36f..14c39095d0b 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Hilfe"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Persönlich"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Benutzer"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Administrator"
 
@@ -114,76 +114,76 @@ msgstr "%s Der Datenbank-Name darf keine Punkte enthalten"
 msgid "%s set the database host."
 msgstr "%s setze den Datenbank-Host"
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL Benutzername und/oder Passwort ungültig"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr "Die Oracle-Verbindung konnte nicht aufgebaut werden."
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL Benutzername und/oder Passwort ungültig"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB Fehler: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Fehlerhafter Befehl war: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Lösche diesen Benutzer aus MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL Benutzer '%s'@'%%' existiert bereits"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Lösche diesen Benutzer aus MySQL."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle Benutzername und/oder Passwort ungültig"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL Benutzername und/oder Passwort ungültig: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>."
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index 4517606c135..68bc158d31f 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -62,7 +62,7 @@ msgstr "Ungültige E-Mail-Adresse"
 msgid "Unable to delete group"
 msgstr "Die Gruppe konnte nicht gelöscht werden"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Der Benutzer konnte nicht gelöscht werden"
 
@@ -140,16 +140,16 @@ msgstr "rückgängig machen"
 msgid "Unable to remove user"
 msgstr "Der Benutzer konnte nicht entfernt werden."
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Gruppen"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Gruppenadministrator"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Löschen"
 
@@ -328,11 +328,11 @@ msgstr "Mehr"
 msgid "Less"
 msgstr "Weniger"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Version"
 
-#: 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 "
@@ -342,27 +342,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Fügen Sie Ihre Anwendung hinzu"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Weitere Anwendungen"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Wählen Sie eine Anwendung aus"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Weitere Anwendungen finden Sie auf apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Update durchführen"
 
@@ -390,76 +390,76 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Kommerzieller Support"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Den Einrichtungsassistenten erneut anzeigen"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Ihr Passwort wurde geändert."
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Das Passwort konnte nicht geändert werden"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Aktuelles Passwort"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Anzeigename"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "E-Mail"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Ihre E-Mail-Adresse"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Sprache"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Helfen Sie bei der Übersetzung"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Verwenden Sie diese Adresse, um Ihren Dateimanager mit Ihrer ownCloud zu verbinden"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Loginname"
 
@@ -467,34 +467,40 @@ msgstr "Loginname"
 msgid "Create"
 msgstr "Erstellen"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr "Admin-Paswort-Wiederherstellung"
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Standard-Speicher"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Unbegrenzt"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Andere"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Speicher"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "Anzeigenamen ändern"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "Neues Passwort setzen"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Standard"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index dcc2c0a3eea..df74745ea34 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/user_webdavauth.po b/l10n/de_DE/user_webdavauth.po
index 44670121a4e..31277b46286 100644
--- a/l10n/de_DE/user_webdavauth.po
+++ b/l10n/de_DE/user_webdavauth.po
@@ -12,8 +12,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -27,8 +27,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV-Authentifizierung"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/el/core.po b/l10n/el/core.po
index a581df81333..2c9a72956ed 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Teogramm <theodorewii121@hotmail.com>, 2013
 # Wasilis <inactive+Wasilis@transifex.com>, 2013
 # KAT.RAT12 <spanish.katerina@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -21,27 +22,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "Ο χρήστης %s διαμοιράστηκε ένα αρχείο με εσάς"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "Ο χρήστης %s διαμοιράστηκε ένα φάκελο με εσάς"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "Ο χρήστης %s διαμοιράστηκε το αρχείο \"%s\" μαζί σας. Είναι διαθέσιμο για λήψη εδώ: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "Ο χρήστης %s διαμοιράστηκε τον φάκελο \"%s\" μαζί σας. Είναι διαθέσιμος για λήψη εδώ: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -394,7 +376,7 @@ msgstr "Η ενημέρωση ήταν ανεπιτυχής. Παρακαλώ σ
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "Επαναφορά συνθηματικού ownCloud"
 
@@ -422,7 +404,19 @@ msgstr "Θα λάβετε ένα σύνδεσμο για να επαναφέρε
 msgid "Username"
 msgstr "Όνομα χρήστη"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Επαναφορά αίτησης"
 
@@ -470,6 +464,21 @@ msgstr "Δεν επιτρέπεται η πρόσβαση"
 msgid "Cloud not found"
 msgstr "Δεν βρέθηκε νέφος"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "υπηρεσίες δικτύου υπό τον έλεγχό σας"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Επεξεργασία κατηγοριών"
@@ -562,16 +571,12 @@ msgstr "Διακομιστής βάσης δεδομένων"
 msgid "Finish setup"
 msgstr "Ολοκλήρωση εγκατάστασης"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "υπηρεσίες δικτύου υπό τον έλεγχό σας"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες στο πώς να αναβαθμίσετε."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Αποσύνδεση"
 
@@ -605,6 +610,13 @@ msgstr "Είσοδος"
 msgid "Alternative Logins"
 msgstr "Εναλλακτικές Συνδέσεις"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "προηγούμενο"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index c9a284845a0..2efedb6c235 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/el/files_encryption.po b/l10n/el/files_encryption.po
index d5c014762f2..4de97f5d2e3 100644
--- a/l10n/el/files_encryption.po
+++ b/l10n/el/files_encryption.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Teogramm <theodorewii121@hotmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -37,67 +38,124 @@ msgstr ""
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Ο κωδικός αλλάχτηκε επιτυχώς."
 
 #: ajax/changeRecoveryPassword.php:51
 msgid "Could not change the password. Maybe the old password was not correct."
+msgstr "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός."
+
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
 msgstr ""
 
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Γίνεται αποθήκευση..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Κρυπτογράφηση"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
-msgstr ""
+msgstr "Επαναφορά κωδικού πρόσβασης λογαριασμού"
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
-msgstr ""
+msgstr "Ενεργοποιημένο"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
-msgstr ""
+msgstr "Απενεργοποιημένο"
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
+msgstr "Αλλαγή Κωδικού Πρόσβασης"
+
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
-msgstr ""
+msgstr "Οι ρυθμίσεις επαναφοράς αρχείων ανανεώθηκαν"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
index e24ab1d1061..644c52dd9d5 100644
--- a/l10n/el/files_external.po
+++ b/l10n/el/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: KAT.RAT12 <spanish.katerina@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index 6003dd739c4..1338d825a5f 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Λήψη"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Δεν υπάρχει διαθέσιμη προεπισκόπηση για"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "υπηρεσίες δικτύου υπό τον έλεγχό σας"
diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po
index 8d8ecee7de1..df58dd7e688 100644
--- a/l10n/el/files_trashbin.po
+++ b/l10n/el/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index 98fd002bf51..de110b11224 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Προσωπικά"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Χρήστες"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Εφαρμογές"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Διαχειριστής"
 
@@ -113,76 +113,76 @@ msgstr "%s μάλλον δεν χρησιμοποιείτε τελείες στ�
 msgid "%s set the database host."
 msgstr "%s ρυθμίση του κεντρικόυ υπολογιστή βάσης δεδομένων. "
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό της PostgreSQL"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Χρειάζεται να εισάγετε είτε έναν υπάρχον λογαριασμό ή του διαχειριστή."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό της MySQL"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Σφάλμα Βάσης Δεδομένων: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Η εντολη παραβατικοτητας ηταν: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Υπάρχει ήδη ο χρήστης '%s'@'localhost' της MySQL."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Απόρριψη αυτού του χρήστη από την MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Ο χρήστης '%s'@'%%' της MySQL υπάρχει ήδη"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Απόρριψη αυτού του χρήστη από την MySQL"
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό της Oracle"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Η εντολη παραβατικοτητας ηταν: \"%s\", ονομα: %s, κωδικος: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Το όνομα χρήστη και/ή ο κωδικός της MS SQL δεν είναι έγκυρα: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ο διακομιστής σας δεν έχει ρυθμιστεί κατάλληλα ώστε να επιτρέπει τον συγχρονισμό αρχείων γιατί η διεπαφή WebDAV πιθανόν να είναι κατεστραμμένη."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>."
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index f54c66cce01..b6ec1e3f17a 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Teogramm <theodorewii121@hotmail.com>, 2013
 # KAT.RAT12 <spanish.katerina@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -59,7 +60,7 @@ msgstr "Μη έγκυρο email"
 msgid "Unable to delete group"
 msgstr "Αδυναμία διαγραφής ομάδας"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Αδυναμία διαγραφής χρήστη"
 
@@ -137,16 +138,16 @@ msgstr "αναίρεση"
 msgid "Unable to remove user"
 msgstr "Αδυναμία αφαίρεση χρήστη"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Ομάδες"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Ομάδα Διαχειριστών"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Διαγραφή"
 
@@ -325,11 +326,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 "
@@ -339,27 +340,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Αναπτύχθηκε από την <a href=\"http://ownCloud.org/contact\" target=\"_blank\">κοινότητα ownCloud</a>, ο <a href=\"https://github.com/owncloud\" target=\"_blank\">πηγαίος κώδικας</a> είναι υπό άδεια χρήσης <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: 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 "Δείτε την σελίδα εφαρμογών στο apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-άδεια από <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Ενημέρωση"
 
@@ -387,76 +388,76 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Εμπορική Υποστήριξη"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Χρησιμοποιήσατε <strong>%s</strong> από διαθέσιμα <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Λήψη της εφαρμογής για συγχρονισμό των αρχείων σας"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Προβολή Πρώτης Εκτέλεσης Οδηγού πάλι"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Χρησιμοποιήσατε <strong>%s</strong> από διαθέσιμα <strong>%s</strong>"
+
+#: 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:81
+#: 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 "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Χρήση αυτής της διεύθυνσης για σύνδεση στο ownCloud με τον διαχειριστή αρχείων σας"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Όνομα Σύνδεσης"
 
@@ -464,34 +465,40 @@ msgstr "Όνομα Σύνδεσης"
 msgid "Create"
 msgstr "Δημιουργία"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
+msgstr "Κωδικός Επαναφοράς Διαχειριστή "
+
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Προκαθορισμένη Αποθήκευση "
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Απεριόριστο"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Άλλο"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Αποθήκευση"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "αλλαγή ονόματος εμφάνισης"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "επιλογή νέου κωδικού"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Προκαθορισμένο"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 639ce39303a..4fb01982b7a 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/el/user_webdavauth.po b/l10n/el/user_webdavauth.po
index 3a75e3ceaee..60764100655 100644
--- a/l10n/el/user_webdavauth.po
+++ b/l10n/el/user_webdavauth.po
@@ -11,8 +11,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgid "WebDAV Authentication"
 msgstr "Αυθεντικοποίηση μέσω WebDAV "
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po
index 63750feeb39..9ac94509680 100644
--- a/l10n/en@pirate/core.po
+++ b/l10n/en@pirate/core.po
@@ -8,9 +8,9 @@ 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:26+0000\n"
-"Last-Translator: lhpalacio <luizhenrique_gomespalacio@hotmail.com>\n"
+"POT-Creation-Date: 2013-06-16 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:14+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,26 +20,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "User %s shared a file with you"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -217,23 +198,23 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr ""
 
@@ -393,7 +374,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -421,7 +402,19 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr ""
 
@@ -469,6 +462,21 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "web services under your control"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -561,16 +569,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "web services under your control"
-
-#: templates/layout.user.php:36
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:61
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr ""
 
@@ -604,6 +608,13 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr ""
diff --git a/l10n/en@pirate/files.po b/l10n/en@pirate/files.po
index c66e0b335d9..0862aa87c47 100644
--- a/l10n/en@pirate/files.po
+++ b/l10n/en@pirate/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/en@pirate/files_encryption.po b/l10n/en@pirate/files_encryption.po
index f27a3729d61..66a55c8294f 100644
--- a/l10n/en@pirate/files_encryption.po
+++ b/l10n/en@pirate/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/en@pirate/files_sharing.po b/l10n/en@pirate/files_sharing.po
index ca065c0596e..b908463f98a 100644
--- a/l10n/en@pirate/files_sharing.po
+++ b/l10n/en@pirate/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: lhpalacio <luizhenrique_gomespalacio@hotmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +43,3 @@ msgstr "Download"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "No preview available for"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "web services under your control"
diff --git a/l10n/en@pirate/settings.po b/l10n/en@pirate/settings.po
index 2dd26cf0d9d..4459d6d1062 100644
--- a/l10n/en@pirate/settings.po
+++ b/l10n/en@pirate/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-05-25 02:02+0200\n"
-"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"POT-Creation-Date: 2013-06-11 01:57+0200\n"
+"PO-Revision-Date: 2013-06-10 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr ""
 
@@ -324,11 +324,11 @@ msgstr ""
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Passcode"
 
@@ -423,39 +423,39 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:56 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:71
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/en@pirate/user_webdavauth.po b/l10n/en@pirate/user_webdavauth.po
index 055e077694e..22b86eac198 100644
--- a/l10n/en@pirate/user_webdavauth.po
+++ b/l10n/en@pirate/user_webdavauth.po
@@ -7,9 +7,9 @@ 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: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index 5ce09e06a02..fd6a695a682 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
-"Last-Translator: Baptiste <baptiste+transifex@darthenay.fr>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,27 +20,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "La uzanto %s kunhavigis dosieron kun vi"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "La uzanto %s kunhavigis dosierujon kun vi"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "La uzanto %s kunhavigis la dosieron “%s” kun vi. Ĝi elŝuteblas el tie ĉi: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "La uzanto %s kunhavigis la dosierujon “%s” kun vi. Ĝi elŝuteblas el tie ĉi: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -393,7 +374,7 @@ msgstr "La ĝisdatigo estis malsukcese. Bonvolu raporti tiun problemon al la <a
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "La pasvorto de ownCloud restariĝis."
 
@@ -421,7 +402,19 @@ msgstr "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton."
 msgid "Username"
 msgstr "Uzantonomo"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Peti rekomencigon"
 
@@ -469,6 +462,21 @@ msgstr "Aliro estas malpermesata"
 msgid "Cloud not found"
 msgstr "La nubo ne estas trovita"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "TTT-servoj regataj de vi"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Redakti kategoriojn"
@@ -561,16 +569,12 @@ msgstr "Datumbaza gastigo"
 msgid "Finish setup"
 msgstr "Fini la instalon"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "TTT-servoj regataj de vi"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Elsaluti"
 
@@ -604,6 +608,13 @@ msgstr "Ensaluti"
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "maljena"
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index 1dde4cff846..4690f2a4c4c 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/eo/files_encryption.po b/l10n/eo/files_encryption.po
index 907d1a9902e..ee93c610b6e 100644
--- a/l10n/eo/files_encryption.po
+++ b/l10n/eo/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Konservante..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Ĉifrado"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/eo/files_external.po b/l10n/eo/files_external.po
index b94c9292474..464418613c1 100644
--- a/l10n/eo/files_external.po
+++ b/l10n/eo/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index 05e9e56a5c2..f3b0f2cc43e 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Elŝuti"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Ne haveblas antaŭvido por"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "TTT-servoj regataj de vi"
diff --git a/l10n/eo/files_trashbin.po b/l10n/eo/files_trashbin.po
index dc3cfdda691..1290cd4fea1 100644
--- a/l10n/eo/files_trashbin.po
+++ b/l10n/eo/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index 88aed749d9b..baa3b35bec5 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Helpo"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Persona"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Agordo"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Uzantoj"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Aplikaĵoj"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Administranto"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 7776c6761c7..7573c48327c 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr "Nevalida retpoŝtadreso"
 msgid "Unable to delete group"
 msgstr "Ne eblis forigi la grupon"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Ne eblis forigi la uzanton"
 
@@ -136,16 +136,16 @@ msgstr "malfari"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Grupoj"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Grupadministranto"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Forigi"
 
@@ -324,11 +324,11 @@ msgstr "Pli"
 msgid "Less"
 msgstr "Malpli"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Eldono"
 
-#: 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 "Ellaborita de la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunumo de ownCloud</a>, la <a href=\"https://github.com/owncloud\" target=\"_blank\">fontokodo</a> publikas laŭ la permesilo <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Aldonu vian aplikaĵon"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Pli da aplikaĵoj"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Elekti aplikaĵon"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Vidu la paĝon pri aplikaĵoj ĉe apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"</span>-permesilhavigita de <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Ĝisdatigi"
 
@@ -386,76 +386,76 @@ msgstr "Cimoraportejo"
 msgid "Commercial Support"
 msgstr "Komerca subteno"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Vi uzas <strong>%s</strong> el la haveblaj <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Vi uzas <strong>%s</strong> el la haveblaj <strong>%s</strong>"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Pasvorto"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Via pasvorto ŝanĝiĝis"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Ne eblis ŝanĝi vian pasvorton"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Nuna pasvorto"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nova pasvorto"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Ŝanĝi la pasvorton"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "Retpoŝto"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Via retpoŝta adreso"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Enigu retpoŝtadreson por kapabligi pasvortan restaŭron"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Lingvo"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Helpu traduki"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Uzu ĉi tiun adreson por konekti al via ownCloud vian dosieradministrilon"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr "Krei"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Defaŭlta konservejo"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Senlima"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Alia"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Konservejo"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Defaŭlta"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 5daf7e0f01b..a6a3bea93f2 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/eo/user_webdavauth.po b/l10n/eo/user_webdavauth.po
index aa3b42b4119..c7675bf3873 100644
--- a/l10n/eo/user_webdavauth.po
+++ b/l10n/eo/user_webdavauth.po
@@ -9,8 +9,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV-aŭtentigo"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 8e1d7080dff..d00c3ea8ff6 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -5,15 +5,16 @@
 # Translators:
 # ggam <ggam@brainleakage.com>, 2013
 # msoko <sokolovitch@yahoo.com>, 2013
+# saskarip, 2013
 # iGerli <stefano@aerosoles.net>, 2013
 # xhiena <xhiena@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
-"Last-Translator: xhiena <xhiena@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: saskarip\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,27 +24,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "El usuario %s ha compartido un archivo contigo."
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "El usuario %s ha compartido una carpeta contigo."
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "El usuario %s ha compartido el archivo \"%s\" contigo. Puedes descargarlo aquí: %s."
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "El usuario %s ha compartido la carpeta \"%s\" contigo. Puedes descargarla aquí: %s."
+msgid "%s shared »%s« with you"
+msgstr "%s compatido  »%s« contigo"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -56,7 +38,7 @@ msgstr "¿Ninguna categoría para añadir?"
 #: ajax/vcategories/add.php:37
 #, php-format
 msgid "This category already exists: %s"
-msgstr "Ya existe esta categoría: %s"
+msgstr "Esta categoría ya existe: %s"
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -73,7 +55,7 @@ msgstr "ID de %s no proporcionado."
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
 msgid "Error adding %s to favorites."
-msgstr "Error añadiendo %s a los favoritos."
+msgstr "Error añadiendo %s a favoritos."
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
@@ -243,7 +225,7 @@ msgstr "Aceptar"
 #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
 msgid "The object type is not specified."
-msgstr "No se ha especificado el tipo de objeto"
+msgstr "El tipo de objeto no está especificado."
 
 #: js/oc-vcategories.js:14 js/oc-vcategories.js:80 js/oc-vcategories.js:95
 #: js/oc-vcategories.js:110 js/oc-vcategories.js:125 js/oc-vcategories.js:136
@@ -255,7 +237,7 @@ msgstr "Error"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
-msgstr "No se ha especificado el nombre de la aplicación."
+msgstr "El nombre de la aplicación no está especificado."
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
@@ -394,15 +376,15 @@ msgstr "La actualización ha fracasado. Por favor, informe de este problema a la
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr "La actualización se ha realizado correctamente. Redireccionando a ownCloud ahora."
+msgstr "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
-msgstr "Restablecer contraseña de ownCloud"
+msgstr "Reseteo contraseña de ownCloud"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
-msgstr "Utiliza el siguiente enlace para restablecer tu contraseña: {link}"
+msgstr "Utilice el siguiente enlace para restablecer tu contraseña: {link}"
 
 #: lostpassword/templates/lostpassword.php:4
 msgid ""
@@ -424,7 +406,19 @@ msgstr "Recibirá un enlace por correo electrónico para restablecer su contrase
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr "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?"
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "Sí. Realmente deseo resetear mi contraseña ahora"
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Solicitar restablecimiento"
 
@@ -466,11 +460,26 @@ msgstr "Ayuda"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr "Acceso denegado"
+msgstr "Acceso prohibido"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr "No se ha encontrado la nube"
+msgstr "No se ha encuentra la nube"
+
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr "Oye,⏎ sólo te hago saber que %s compartido %s contigo.⏎ Míralo: %s ⏎Disfrutalo!"
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "Servicios web bajo su control"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -487,7 +496,7 @@ msgstr "Advertencia de seguridad"
 
 #: templates/installation.php:25
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr "La versión de PHP es vulnerable al ataque de Byte NULL (CVE-2006-7243)"
+msgstr "Su versión de PHP es vulnerable al ataque de Byte NULL (CVE-2006-7243)"
 
 #: templates/installation.php:26
 msgid "Please update your PHP installation to use ownCloud securely."
@@ -509,7 +518,7 @@ msgstr "Sin un generador de números aleatorios seguro, un atacante podría pred
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr "Probablemente su directorio de datos y sus archivos sean accesibles a través de internet ya que el archivo .htaccess no funciona."
+msgstr "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona."
 
 #: templates/installation.php:40
 msgid ""
@@ -528,7 +537,7 @@ msgstr "Avanzado"
 
 #: templates/installation.php:64
 msgid "Data folder"
-msgstr "Directorio de almacenamiento"
+msgstr "Directorio de datos"
 
 #: templates/installation.php:74
 msgid "Configure the database"
@@ -564,16 +573,12 @@ msgstr "Host de la base de datos"
 msgid "Finish setup"
 msgstr "Completar la instalación"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "Servicios web bajo su control"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s esta disponible. Obtener mas información de como actualizar."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Salir"
 
@@ -597,7 +602,7 @@ msgstr "¿Ha perdido su contraseña?"
 
 #: templates/login.php:39
 msgid "remember"
-msgstr "recordarme"
+msgstr "recordar"
 
 #: templates/login.php:41
 msgid "Log in"
@@ -605,7 +610,14 @@ msgstr "Entrar"
 
 #: templates/login.php:47
 msgid "Alternative Logins"
-msgstr "Nombre de usuarios alternativos"
+msgstr "Inicios de sesión alternativos"
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr "Oye,<br><br>sólo te hago saber que %s compartido %s contigo,<br><a href=\"%s\">\nMíralo!</a><br><br>Disfrutalo!"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index e7ca04f999f..6c27b6b67f3 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
index 21f59f5c760..22d85a2f2c6 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # gmoriello <gmoriello@gmail.com>, 2013
+# saskarip, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-02 02:00+0200\n"
-"PO-Revision-Date: 2013-06-01 23:40+0000\n"
-"Last-Translator: gmoriello <gmoriello@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 08:20+0000\n"
+"Last-Translator: saskarip\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,61 +45,118 @@ msgstr "Su contraseña ha sido cambiada"
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta."
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr "Contraseña de clave privada actualizada con éxito."
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Guardando..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr "Habilitar clave de recuperación de contraseñas ():"
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr "Recuperar contraseña"
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr "Habilitar"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr "Deshabilitado"
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr "Cambiar clave de cifrado de contraseñas:"
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr "Contraseña de recuperación actual"
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr "Contraseña de recuperación nueva"
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
-msgstr "Habilitar recuperación de contraseña compartiendo todos los archivos con su administrador"
-
 #: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
-msgstr "Habilitar esta opción para poder acceder a sus archivos cifrados si pierde su contraseña"
+"files in case of password loss"
+msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr "Opciones de recuperación de archivos actualizada"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr "No se pudo actualizar la recuperación de archivos"
diff --git a/l10n/es/files_external.po b/l10n/es/files_external.po
index 5cb34b9ac1e..5f962c9b753 100644
--- a/l10n/es/files_external.po
+++ b/l10n/es/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index 85e841e2150..59524a67af7 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Descargar"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "No hay vista previa disponible para"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "Servicios web bajo su control"
diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po
index e7a92574d3c..33587c79aea 100644
--- a/l10n/es/files_trashbin.po
+++ b/l10n/es/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index bc847baf946..28174f0132f 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: xhiena <xhiena@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Ayuda"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Ajustes"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Usuarios"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Aplicaciones"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Administración"
 
@@ -114,76 +114,76 @@ msgstr "%s no se puede utilizar puntos en el nombre de la base de datos"
 msgid "%s set the database host."
 msgstr "%s ingresar el host de la base de datos."
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Usuario y/o contraseña de PostgreSQL no válidos"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Tiene que ingresar una cuenta existente o la del administrador."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr "No se pudo establecer la conexión a Oracle"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "Usuario y/o contraseña de MySQL no válidos"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Error BD: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Comando infractor: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Usuario MySQL '%s'@'localhost' ya existe."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Eliminar este usuario de MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Usuario MySQL '%s'@'%%' ya existe"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Eliminar este usuario de MySQL."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Usuario y/o contraseña de Oracle no válidos"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Comando infractor: \"%s\", nombre: %s, contraseña: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Usuario y/o contraseña de MS SQL no válidos: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>."
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index e1957520400..e2db2aa83f5 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -5,14 +5,15 @@
 # Translators:
 # Art O. Pal <artopal@fastmail.fm>, 2013
 # ggam <ggam@brainleakage.com>, 2013
+# saskarip, 2013
 # scambra <sergio@programatica.es>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: saskarip\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -61,7 +62,7 @@ msgstr "Correo no válido"
 msgid "Unable to delete group"
 msgstr "No se pudo eliminar el grupo"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "No se pudo eliminar el usuario"
 
@@ -139,16 +140,16 @@ msgstr "deshacer"
 msgid "Unable to remove user"
 msgstr "No se puede eliminar el usuario"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Grupo administrador"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -327,11 +328,11 @@ msgstr "Más"
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Versión"
 
-#: 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 "
@@ -341,27 +342,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Añade tu aplicación"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Más aplicaciones"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Seleccionar una aplicación"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Echa un vistazo a la web de aplicaciones apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Actualizar"
 
@@ -389,76 +390,76 @@ msgstr "Rastreador de fallos"
 msgid "Commercial Support"
 msgstr "Soporte comercial"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Obtener las aplicaciones para sincronizar sus archivos"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Mostrar asistente para iniciar otra vez"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Su contraseña ha sido cambiada"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "No se ha podido cambiar su contraseña"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Nombre a mostrar"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Su dirección de correo"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Escriba una dirección de correo electrónico para restablecer la contraseña"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Ayúdnos a traducir"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Use esta dirección para conectarse a su cuenta de ownCloud en el administrador de archivos"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Nombre de usuario"
 
@@ -466,34 +467,40 @@ msgstr "Nombre de usuario"
 msgid "Create"
 msgstr "Crear"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr "Recuperación de la contraseña de administración"
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr "Introduzca la contraseña de recuperación para recuperar los archivos de usuarios durante el cambio de contraseña."
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Almacenamiento predeterminado"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Otro"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Almacenamiento"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "Cambiar nombre a mostrar"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "Configurar nueva contraseña"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Predeterminado"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 3492a970c93..b8c4a7c4a0d 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: xhiena <xhiena@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/es/user_webdavauth.po b/l10n/es/user_webdavauth.po
index 9b520ddeaae..5d60f41af1b 100644
--- a/l10n/es/user_webdavauth.po
+++ b/l10n/es/user_webdavauth.po
@@ -6,13 +6,14 @@
 # Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
 # Art O. Pal <artopal@fastmail.fm>, 2012
 # pggx999 <pggx999@gmail.com>, 2012
+# saskarip, 2013
 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:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 07:50+0000\n"
+"Last-Translator: saskarip\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,8 +26,8 @@ msgid "WebDAV Authentication"
 msgstr "Autenticación de WevDAV"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr "URL:"
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index 727d03a799b..f280c8cad8d 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# cjtess <claudio.tessone@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +20,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "El usurario %s compartió un archivo con vos."
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "El usurario %s compartió una carpeta con vos."
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "El usuario %s compartió el archivo \"%s\" con vos. Está disponible para su descarga aquí: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "El usuario %s compartió el archivo \"%s\" con vos. Está disponible para su descarga aquí: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -222,7 +204,7 @@ msgstr "Cancelar"
 
 #: js/oc-dialogs.js:141 js/oc-dialogs.js:200
 msgid "Error loading file picker template"
-msgstr ""
+msgstr "Error al cargar la plantilla del seleccionador de archivos"
 
 #: js/oc-dialogs.js:164
 msgid "Yes"
@@ -392,7 +374,7 @@ msgstr "La actualización no pudo ser completada. Por favor, reportá el inconve
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "La actualización fue exitosa. Estás siendo redirigido a ownCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "Restablecer contraseña de ownCloud"
 
@@ -405,11 +387,11 @@ msgid ""
 "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 ."
-msgstr ""
+msgstr "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."
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "¡Error en el pedido! <br> ¿Estás seguro de que tu dirección de correo electrónico o nombre de usuario son correcto?"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
@@ -420,7 +402,19 @@ msgstr "Vas a recibir un enlace por e-mail para restablecer tu contraseña"
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Solicitar restablecimiento"
 
@@ -468,6 +462,21 @@ msgstr "Acceso denegado"
 msgid "Cloud not found"
 msgstr "No se encontró ownCloud"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "servicios web controlados por vos"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Editar categorías"
@@ -560,16 +569,12 @@ msgstr "Host de la base de datos"
 msgid "Finish setup"
 msgstr "Completar la instalación"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "servicios web controlados por vos"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s está disponible. Obtené más información sobre cómo actualizar."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Cerrar la sesión"
 
@@ -603,6 +608,13 @@ msgstr "Entrar"
 msgid "Alternative Logins"
 msgstr "Nombre alternativos de usuarios"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "anterior"
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index d9e2e53a2e4..5fcac0ee39b 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/files_encryption.po b/l10n/es_AR/files_encryption.po
index 0fd32631ce9..a7dfbddca46 100644
--- a/l10n/es_AR/files_encryption.po
+++ b/l10n/es_AR/files_encryption.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# cjtess <claudio.tessone@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-15 01:58+0200\n"
+"PO-Revision-Date: 2013-06-14 11:54+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -37,67 +38,124 @@ msgstr ""
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Tu contraseña fue cambiada"
 
 #: ajax/changeRecoveryPassword.php:51
 msgid "Could not change the password. Maybe the old password was not correct."
+msgstr "No se pudo cambiar la contraseña. Comprobá que la contraseña actual sea correcta."
+
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
 msgstr ""
 
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Guardando..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Encriptación"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
-msgstr ""
+msgstr "Habilitar clave de recuperación de contraseñas (permite compartir clave de contraseñas):"
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
-msgstr ""
+msgstr "Recuperar contraseña"
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/es_AR/files_external.po b/l10n/es_AR/files_external.po
index 9eede88f247..22d72d0ce5d 100644
--- a/l10n/es_AR/files_external.po
+++ b/l10n/es_AR/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# cjtess <claudio.tessone@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,7 +56,7 @@ msgid ""
 "<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."
-msgstr ""
+msgstr "<b>Advertencia:</b> El soporte de Curl de PHP no está activado ni instalado. Montar servicios ownCloud, WebDAV y/o GoogleDrive no será posible. Pedile al administrador del sistema que lo instale."
 
 #: templates/settings.php:3
 msgid "External Storage"
diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po
index b238bca305a..795ee41eee2 100644
--- a/l10n/es_AR/files_sharing.po
+++ b/l10n/es_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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Descargar"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "La vista preliminar no está disponible para"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "servicios web controlados por vos"
diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po
index 56dcea4599a..77ce2e0f6a9 100644
--- a/l10n/es_AR/files_trashbin.po
+++ b/l10n/es_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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po
index d7ef7401c5e..d564d6a908d 100644
--- a/l10n/es_AR/lib.po
+++ b/l10n/es_AR/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# cjtess <claudio.tessone@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,27 +18,27 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Ayuda"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Configuración"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Usuarios"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Aplicaciones"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Administración"
 
@@ -113,76 +114,76 @@ msgstr "%s no puede usar puntos en el nombre de la Base de Datos"
 msgid "%s set the database host."
 msgstr "%s Especifique la dirección de la Base de Datos"
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nombre de usuario o contraseña de PostgradeSQL no válido."
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Debe ingresar una cuenta existente o el administrador"
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
-msgstr ""
+msgstr "No fue posible establecer la conexión a Oracle"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "Usuario y/o contraseña MySQL no válido"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Error DB: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "El comando no comprendido es: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Usuario MySQL '%s'@'localhost' ya existente"
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Borrar este usuario de MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Usuario MySQL '%s'@'%%' ya existente"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Borrar este usuario de MySQL"
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "El nombre de usuario y contraseña no son válidos"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "El comando no comprendido es: \"%s\", nombre: \"%s\", contraseña: \"%s\""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Nombre de usuario y contraseña de MS SQL no son válidas: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>."
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index 7a71ab611c4..c83eac5a4d6 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
+# cjtess <claudio.tessone@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,7 +60,7 @@ msgstr "el e-mail no es válido "
 msgid "Unable to delete group"
 msgstr "No fue posible eliminar el grupo"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "No fue posible eliminar el usuario"
 
@@ -137,16 +138,16 @@ msgstr "deshacer"
 msgid "Unable to remove user"
 msgstr "Imposible remover usuario"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Grupo Administrador"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Borrar"
 
@@ -325,11 +326,11 @@ msgstr "Más"
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Versión"
 
-#: 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 "
@@ -339,27 +340,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Añadí tu aplicación"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Más aplicaciones"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Seleccionar una aplicación"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Mirá la web de aplicaciones apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\">"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Actualizar"
 
@@ -387,76 +388,76 @@ msgstr "Informar errores"
 msgid "Commercial Support"
 msgstr "Soporte comercial"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Usaste  <strong>%s</strong>  de los  <strong>%s</strong>  disponibles"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Obtené aplicaciones para sincronizar tus archivos"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Mostrar de nuevo el asistente de primera ejecución"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Usaste  <strong>%s</strong>  de los  <strong>%s</strong>  disponibles"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Tu contraseña fue cambiada"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "No fue posible cambiar tu contraseña"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nueva contraseña:"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Nombre a mostrar"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "Correo Electrónico"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Tu dirección de e-mail"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Escribí una dirección de correo electrónico para restablecer la contraseña"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Ayudanos a traducir"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Utiliza esta dirección para conectarte con ownCloud en tu Administrador de Archivos"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Nombre de "
 
@@ -464,34 +465,40 @@ msgstr "Nombre de "
 msgid "Create"
 msgstr "Crear"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
-msgstr ""
+msgstr "Recuperación de contraseña de administrador"
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr "Ingresá la contraseña de recuperación para recuperar los archivos de usuario al cambiar contraseña"
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Almacenamiento Predeterminado"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Otros"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Almacenamiento"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "Cambiar el nombre que se muestra"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "Configurar nueva contraseña"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Predeterminado"
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index 239834a369c..9d3126e455d 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# cjtess <claudio.tessone@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +28,7 @@ msgstr "Fallo al borrar la configuración del servidor"
 
 #: ajax/testConfiguration.php:36
 msgid "The configuration is valid and the connection could be established!"
-msgstr "La configuración es valida y la conexión pudo ser establecida."
+msgstr "La configuración es válida y la conexión pudo ser establecida."
 
 #: ajax/testConfiguration.php:39
 msgid ""
diff --git a/l10n/es_AR/user_webdavauth.po b/l10n/es_AR/user_webdavauth.po
index 752a64616bb..331ef231ba7 100644
--- a/l10n/es_AR/user_webdavauth.po
+++ b/l10n/es_AR/user_webdavauth.po
@@ -10,8 +10,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgid "WebDAV Authentication"
 msgstr "Autenticación de WevDAV"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 9e9074ef68a..2883d8d0513 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,27 +21,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "Kasutaja %s jagas sinuga faili"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "Kasutaja %s jagas Sinuga kausta."
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "Kasutaja %s jagas sinuga faili \"%s\". See on allalaadimiseks saadaval siin: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "Kasutaja %s jagas sinuga kausta \"%s\". See on allalaadimiseks saadaval siin: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -394,7 +375,7 @@ msgstr "Uuendus ebaõnnestus. Palun teavita probleemidest  <a href=\"https://git
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "ownCloud parooli taastamine"
 
@@ -422,7 +403,19 @@ msgstr "Sinu parooli taastamise link saadetakse sulle e-postile."
 msgid "Username"
 msgstr "Kasutajanimi"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Päringu taastamine"
 
@@ -470,6 +463,21 @@ msgstr "Ligipääs on keelatud"
 msgid "Cloud not found"
 msgstr "Pilve ei leitud"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "veebitenused sinu kontrolli all"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Muuda kategooriaid"
@@ -562,16 +570,12 @@ msgstr "Andmebaasi host"
 msgid "Finish setup"
 msgstr "Lõpeta seadistamine"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "veebiteenused sinu kontrolli all"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s on saadaval. Vaata lähemalt kuidas uuendada."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Logi välja"
 
@@ -605,6 +609,13 @@ msgstr "Logi sisse"
 msgid "Alternative Logins"
 msgstr "Alternatiivsed sisselogimisviisid"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "eelm"
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 39ebd8be087..8fcd0d40728 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/files_encryption.po b/l10n/et_EE/files_encryption.po
index 2bcdd23d943..4804e9375ea 100644
--- a/l10n/et_EE/files_encryption.po
+++ b/l10n/et_EE/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-31 01:58+0200\n"
-"PO-Revision-Date: 2013-05-30 08:30+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,61 +45,118 @@ msgstr "Parool edukalt vahetatud."
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud."
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Salvestamine..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Krüpteerimine"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr "Luba krüpteerimise paroolide taastevõti (võimalda parooli jagamine taastevõtmesse):"
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr "Konto taasteparool"
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr "Sisse lülitatud"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr "Väljalülitatud"
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr "Muuda taaste võtme krüpteerimise paroole:"
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr "Konto vana taaste parool"
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr "Konto uus taasteparool"
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr "Muuda parooli"
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
-msgstr "Luba parooli taaste jagades kõik failid administraatoriga:"
-
 #: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
-msgstr "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parool on kadunud"
+"files in case of password loss"
+msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr "Faili taaste seaded uuendatud"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr "Ei suuda uuendada taastefaili"
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
index 598c6ab86d0..45901994a0d 100644
--- a/l10n/et_EE/files_external.po
+++ b/l10n/et_EE/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index 67fba4649ea..f62aa3e162c 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,7 +42,3 @@ msgstr "Lae alla"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Eelvaadet pole saadaval"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "veebitenused sinu kontrolli all"
diff --git a/l10n/et_EE/files_trashbin.po b/l10n/et_EE/files_trashbin.po
index 05e9b289416..d1f969bba0b 100644
--- a/l10n/et_EE/files_trashbin.po
+++ b/l10n/et_EE/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index 1178f6d167e..e8fa7e426fd 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,27 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Abiinfo"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Isiklik"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Seaded"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Kasutajad"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Rakendused"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Admin"
 
@@ -115,76 +115,76 @@ msgstr "%s punktide kasutamine andmebaasi nimes pole lubatud"
 msgid "%s set the database host."
 msgstr "%s määra andmebaasi server."
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL kasutajatunnus ja/või parool pole õiged"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Sisesta kas juba olemasolev konto või administrator."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr "Ei suuda luua ühendust Oracle baasiga"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL kasutajatunnus ja/või parool pole õiged"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Andmebaasi viga: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Tõrkuv käsk oli: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL kasutaja '%s'@'localhost' on juba olemas."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Kustuta see kasutaja MySQL-ist"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL kasutaja '%s'@'%%' on juba olemas"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Kustuta see kasutaja MySQL-ist."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle kasutajatunnus ja/või parool pole õiged"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Tõrkuv käsk oli: \"%s\", nimi: %s, parool: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL kasutajatunnus ja/või parool pole õiged: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>."
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index d1364b68713..a45a8eec0d6 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -60,7 +60,7 @@ msgstr "Vigane e-post"
 msgid "Unable to delete group"
 msgstr "Grupi kustutamine ebaõnnestus"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Kasutaja kustutamine ebaõnnestus"
 
@@ -138,16 +138,16 @@ msgstr "tagasi"
 msgid "Unable to remove user"
 msgstr "Kasutaja eemaldamine ebaõnnestus"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Grupid"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Grupi admin"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Kustuta"
 
@@ -326,11 +326,11 @@ msgstr "Rohkem"
 msgid "Less"
 msgstr "Vähem"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Versioon"
 
-#: 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 "
@@ -340,27 +340,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Arendatud <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kogukonna</a> poolt. <a href=\"https://github.com/owncloud\" target=\"_blank\">Lähtekood</a> on avaldatud ja kaetud <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> litsentsiga."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Lisa oma rakendus"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Veel rakendusi"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Vali programm"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Vaata rakenduste lehte aadressil apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-litsenseeritud <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Uuenda"
 
@@ -388,76 +388,76 @@ msgstr "Vigade nimekiri"
 msgid "Commercial Support"
 msgstr "Tasuline kasutajatugi"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Kasutad <strong>%s</strong> saadavalolevast <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Hangi rakendusi failide sünkroniseerimiseks"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Näita veelkord Esmase Käivituse Juhendajat"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Kasutad <strong>%s</strong> saadavalolevast <strong>%s</strong>"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Parool"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Sinu parooli on muudetud"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Sa ei saa oma parooli muuta"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Praegune parool"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Uus parool"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Muuda parooli"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Näidatav nimi"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Sinu e-posti aadress"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Keel"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Aita tõlkida"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Kasuta seda aadressi ühendamaks oma ownCloudi failihalduriga"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Kasutajanimi"
 
@@ -465,34 +465,40 @@ msgstr "Kasutajanimi"
 msgid "Create"
 msgstr "Lisa"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr "Admin taasteparool"
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr "Sisesta taasteparool kasutaja failide taastamiseks paroolivahetuse käigus"
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Vaikimisi maht"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Piiramatult"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Muu"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Maht"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "muuda näidatavat nime"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "määra uus parool"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Vaikeväärtus"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index 0543ae5258d..26fc9649f5b 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/user_webdavauth.po b/l10n/et_EE/user_webdavauth.po
index ee2a1e41f43..21fbf41a04f 100644
--- a/l10n/et_EE/user_webdavauth.po
+++ b/l10n/et_EE/user_webdavauth.po
@@ -9,9 +9,9 @@ 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:26+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,8 +24,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV autentimine"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index fa45cb1a5f2..0f198f82cd9 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "%s erabiltzaileak zurekin fitxategi bat elkarbanatu du "
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "%s erabiltzaileak zurekin karpeta bat elkarbanatu du "
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "%s erabiltzaileak \"%s\" fitxategia zurekin elkarbanatu du. Hemen duzu eskuragarri:  %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "%s erabiltzaileak \"%s\" karpeta zurekin elkarbanatu du. Hemen duzu eskuragarri:  %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -392,7 +373,7 @@ msgstr "Eguneraketa ez da ongi egin. Mesedez egin arazoaren txosten bat <a href=
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "ownCloud-en pasahitza berrezarri"
 
@@ -420,7 +401,19 @@ msgstr "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez."
 msgid "Username"
 msgstr "Erabiltzaile izena"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Eskaera berrezarri da"
 
@@ -468,6 +461,21 @@ msgstr "Sarrera debekatuta"
 msgid "Cloud not found"
 msgstr "Ez da hodeia aurkitu"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "web zerbitzuak zure kontrolpean"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Editatu kategoriak"
@@ -560,16 +568,12 @@ msgstr "Datubasearen hostalaria"
 msgid "Finish setup"
 msgstr "Bukatu konfigurazioa"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "web zerbitzuak zure kontrolpean"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Saioa bukatu"
 
@@ -603,6 +607,13 @@ msgstr "Hasi saioa"
 msgid "Alternative Logins"
 msgstr "Beste erabiltzaile izenak"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "aurrekoa"
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 027b499cf06..de510d55f48 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/eu/files_encryption.po b/l10n/eu/files_encryption.po
index 1e367b1e9c5..e3af65c88a3 100644
--- a/l10n/eu/files_encryption.po
+++ b/l10n/eu/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Gordetzen..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Enkriptazioa"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po
index 1dca4130ecf..f9f3072e7d8 100644
--- a/l10n/eu/files_external.po
+++ b/l10n/eu/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index f4022f637bd..f18c28fcabf 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Deskargatu"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Ez dago aurrebista eskuragarririk hauentzat "
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "web zerbitzuak zure kontrolpean"
diff --git a/l10n/eu/files_trashbin.po b/l10n/eu/files_trashbin.po
index 4200e182be2..4326abaa034 100644
--- a/l10n/eu/files_trashbin.po
+++ b/l10n/eu/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po
index bcacb051ea3..d235762943b 100644
--- a/l10n/eu/lib.po
+++ b/l10n/eu/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Laguntza"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Pertsonala"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Erabiltzaileak"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Aplikazioak"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Admin"
 
@@ -113,76 +113,76 @@ msgstr "%s ezin duzu punturik erabili datu basearen izenean."
 msgid "%s set the database host."
 msgstr "%s sartu datu basearen hostalaria."
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL erabiltzaile edota pasahitza ez dira egokiak."
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Existitzen den kontu bat edo administradorearena jarri behar duzu."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL erabiltzaile edota pasahitza ez dira egokiak."
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB errorea: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Errorea komando honek sortu du: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL '%s'@'localhost' erabiltzailea dagoeneko existitzen da."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Ezabatu erabiltzaile hau MySQLtik"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL '%s'@'%%' erabiltzailea dagoeneko existitzen da"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Ezabatu erabiltzaile hau MySQLtik."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle erabiltzaile edota pasahitza ez dira egokiak."
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Errorea komando honek sortu du: \"%s\", izena: %s, pasahitza: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL erabiltzaile izena edota pasahitza ez dira egokiak: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Mesedez begiratu <a href='%s'>instalazio gidak</a>."
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index e20ca8ffafc..cda52d17776 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr "Baliogabeko eposta"
 msgid "Unable to delete group"
 msgstr "Ezin izan da taldea ezabatu"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Ezin izan da erabiltzailea ezabatu"
 
@@ -136,16 +136,16 @@ msgstr "desegin"
 msgid "Unable to remove user"
 msgstr "Ezin izan da erabiltzailea aldatu"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Taldeak"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Talde administradorea"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Ezabatu"
 
@@ -324,11 +324,11 @@ msgstr "Gehiago"
 msgid "Less"
 msgstr "Gutxiago"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Bertsioa"
 
-#: 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 "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Gehitu zure aplikazioa"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "App gehiago"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Aukeratu programa bat"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Ikusi programen orria apps.owncloud.com en"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lizentziatua <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Eguneratu"
 
@@ -386,76 +386,76 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Babes komertziala"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Lortu aplikazioak zure fitxategiak sinkronizatzeko"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Erakutsi berriz Lehenengo Aldiko Morroia"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Pasahitza"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Zere pasahitza aldatu da"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Ezin izan da zure pasahitza aldatu"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Uneko pasahitza"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Pasahitz berria"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Aldatu pasahitza"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Bistaratze Izena"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "E-posta"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Zure e-posta"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Hizkuntza"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Lagundu itzultzen"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Erabili helbide hau zure fitxategi kudeatzailean zure ownCloudera konektatzeko"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Sarrera Izena"
 
@@ -463,34 +463,40 @@ msgstr "Sarrera Izena"
 msgid "Create"
 msgstr "Sortu"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Lehenetsitako Biltegiratzea"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Mugarik gabe"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Bestelakoa"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Biltegiratzea"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "aldatu bistaratze izena"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "ezarri pasahitz berria"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Lehenetsia"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index 982075fe6c8..d309a16d240 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/eu/user_webdavauth.po b/l10n/eu/user_webdavauth.po
index c9297b3ff2e..03f85ec7ec0 100644
--- a/l10n/eu/user_webdavauth.po
+++ b/l10n/eu/user_webdavauth.po
@@ -9,8 +9,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV Autentikazioa"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 4f77315e6bd..e8d5bb2927e 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "کاربر %s  یک پرونده را با شما به اشتراک گذاشته است."
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "کاربر %s  یک پوشه را با شما به اشتراک گذاشته است."
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "کاربر %s پرونده \"%s\" را با شما به اشتراک گذاشته است. پرونده برای دانلود اینجاست : %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "کاربر %s پوشه \"%s\" را با شما به اشتراک گذاشته است. پرونده برای دانلود اینجاست : %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -392,7 +373,7 @@ msgstr "به روز رسانی ناموفق بود. لطفا این خطا را
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "پسورد ابرهای شما تغییرکرد"
 
@@ -420,7 +401,19 @@ msgstr "شما یک نامه الکترونیکی حاوی یک لینک جهت
 msgid "Username"
 msgstr "نام کاربری"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "درخواست دوباره سازی"
 
@@ -468,6 +461,21 @@ msgstr "اجازه دسترسی به مناطق ممنوعه را ندارید"
 msgid "Cloud not found"
 msgstr "پیدا نشد"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "سرویس های تحت وب در کنترل شما"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "ویرایش گروه"
@@ -560,16 +568,12 @@ msgstr "هاست پایگاه داده"
 msgid "Finish setup"
 msgstr "اتمام نصب"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "سرویس های تحت وب در کنترل شما"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "خروج"
 
@@ -603,6 +607,13 @@ msgstr "ورود"
 msgid "Alternative Logins"
 msgstr "ورود متناوب"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "بازگشت"
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 55637830aa9..4088d74bfa0 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fa/files_encryption.po b/l10n/fa/files_encryption.po
index 67d35105e3b..f2486e064c7 100644
--- a/l10n/fa/files_encryption.po
+++ b/l10n/fa/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "در حال ذخیره سازی..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "رمزگذاری"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/fa/files_external.po b/l10n/fa/files_external.po
index d9fdb59a7ad..103a387cfce 100644
--- a/l10n/fa/files_external.po
+++ b/l10n/fa/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index e24ced2bed9..8c0f3a52afb 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "دانلود"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "هیچگونه پیش نمایشی موجود نیست"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "سرویس های تحت وب در کنترل شما"
diff --git a/l10n/fa/files_trashbin.po b/l10n/fa/files_trashbin.po
index 9b91652c1a2..76a3c90d7b5 100644
--- a/l10n/fa/files_trashbin.po
+++ b/l10n/fa/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po
index 0ceea35285d..ebfaf2736b1 100644
--- a/l10n/fa/lib.po
+++ b/l10n/fa/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "راه‌نما"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "شخصی"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "کاربران"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "  برنامه ها"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "مدیر"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "احتمالاً وب سرور شما طوری تنظیم نشده است که اجازه ی همگام سازی فایلها را بدهد زیرا به نظر میرسد رابط WebDAV از کار افتاده است."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید."
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 88ea7add2e6..e171ee0b25c 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\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 "حذف کاربر امکان پذیر نیست"
 
@@ -136,16 +136,16 @@ msgstr "بازگشت"
 msgid "Unable to remove user"
 msgstr "حذف کاربر امکان پذیر نیست"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "گروه ها"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "گروه مدیران"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 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 "توسعه یافته به وسیله ی  <a href=\"http://ownCloud.org/contact\" target=\"_blank\">انجمن ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">کد اصلی</a> مجاز زیر گواهی <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: 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 "صفحه این اٌپ را در apps.owncloud.com ببینید"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-مجاز از طرف <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "به روز رسانی"
 
@@ -386,76 +386,76 @@ msgstr "ردیاب باگ "
 msgid "Commercial Support"
 msgstr "پشتیبانی تجاری"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "شما استفاده کردید از <strong>%s</strong> از میزان در دسترس <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "برنامه ها را دریافت کنید تا فایل هایتان را همگام سازید"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "راهبری کمکی اجرای اول را دوباره نمایش بده"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "شما استفاده کردید از <strong>%s</strong> از میزان در دسترس <strong>%s</strong>"
+
+#: 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:81
+#: 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 "از این نشانی برای اتصال به ownCloud خودتان در بخش مدیریت فایل خودتان استفاده کنید"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "نام کاربری"
 
@@ -463,34 +463,40 @@ msgstr "نام کاربری"
 msgid "Create"
 msgstr "ایجاد کردن"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "ذخیره سازی پیش فرض"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "نامحدود"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "دیگر"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "حافظه"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "تغییر نام نمایشی"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "تنظیم کلمه عبور جدید"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "پیش فرض"
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index 9cbf6d746da..c40115d3cc9 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fa/user_webdavauth.po b/l10n/fa/user_webdavauth.po
index f89e5c1febb..1310a3b5e67 100644
--- a/l10n/fa/user_webdavauth.po
+++ b/l10n/fa/user_webdavauth.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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 789d30a471e..bdfd8813cfa 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,27 +20,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "Käyttäjä %s jakoi tiedoston kanssasi"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "Käyttäjä %s jakoi kansion kanssasi"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "Käyttäjä %s jakoi tiedoston \"%s\" kanssasi. Se on ladattavissa täältä: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "Käyttäjä %s jakoi kansion \"%s\" kanssasi. Se on ladattavissa täältä: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -393,7 +374,7 @@ msgstr "Päivitys epäonnistui. Ilmoita ongelmasta <a href=\"https://github.com/
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "ownCloud-salasanan nollaus"
 
@@ -421,7 +402,19 @@ msgstr "Saat sähköpostitse linkin nollataksesi salasanan."
 msgid "Username"
 msgstr "Käyttäjätunnus"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Tilaus lähetetty"
 
@@ -469,6 +462,21 @@ msgstr "Pääsy estetty"
 msgid "Cloud not found"
 msgstr "Pilveä ei löydy"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "verkkopalvelut hallinnassasi"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Muokkaa luokkia"
@@ -561,16 +569,12 @@ msgstr "Tietokantapalvelin"
 msgid "Finish setup"
 msgstr "Viimeistele asennus"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "verkkopalvelut hallinnassasi"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Kirjaudu ulos"
 
@@ -604,6 +608,13 @@ msgstr "Kirjaudu sisään"
 msgid "Alternative Logins"
 msgstr "Vaihtoehtoiset kirjautumiset"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "edellinen"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index cc9cb30de39..3ceebe58033 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/files_encryption.po b/l10n/fi_FI/files_encryption.po
index df1e78980c0..7a4bc5fbf9c 100644
--- a/l10n/fi_FI/files_encryption.po
+++ b/l10n/fi_FI/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -44,61 +44,118 @@ msgstr "Salasana vaihdettiin onnistuneesti."
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin."
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Tallennetaan..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Salaus"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr "Käytössä"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr "Ei käytössä"
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr "Vaihda salasana"
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/fi_FI/files_external.po b/l10n/fi_FI/files_external.po
index 4a7a1b6c088..1c0f407e5be 100644
--- a/l10n/fi_FI/files_external.po
+++ b/l10n/fi_FI/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index 9e9b36d0241..4c2f4e74a95 100644
--- a/l10n/fi_FI/files_sharing.po
+++ b/l10n/fi_FI/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Lataa"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Ei esikatselua kohteelle"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "verkkopalvelut hallinnassasi"
diff --git a/l10n/fi_FI/files_trashbin.po b/l10n/fi_FI/files_trashbin.po
index 0dad42f9469..0895be2d325 100644
--- a/l10n/fi_FI/files_trashbin.po
+++ b/l10n/fi_FI/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index 08b94bc57d5..296b0e0ed6f 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Ohje"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Asetukset"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Sovellukset"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Ylläpitäjä"
 
@@ -114,76 +114,76 @@ msgstr "%s et voi käyttää pisteitä tietokannan nimessä"
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL:n käyttäjätunnus ja/tai salasana on väärin"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr "Oracle-yhteyttä ei voitu muodostaa"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL:n käyttäjätunnus ja/tai salasana on väärin"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Tietokantavirhe: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL-käyttäjä '%s'@'localhost' on jo olemassa."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Pudota tämä käyttäjä MySQL:stä"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL-käyttäjä '%s'@'%%' on jo olemassa"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Pudota tämä käyttäjä MySQL:stä."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Oraclen käyttäjätunnus ja/tai salasana on väärin"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL -käyttäjätunnus ja/tai -salasana on väärin: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Lue tarkasti <a href='%s'>asennusohjeet</a>."
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 920ce9d22b8..8f1623db40e 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -59,7 +59,7 @@ msgstr "Virheellinen sähköposti"
 msgid "Unable to delete group"
 msgstr "Ryhmän poisto epäonnistui"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Käyttäjän poisto epäonnistui"
 
@@ -137,16 +137,16 @@ msgstr "kumoa"
 msgid "Unable to remove user"
 msgstr "Käyttäjän poistaminen ei onnistunut"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Ryhmät"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Ryhmän ylläpitäjä"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Poista"
 
@@ -325,11 +325,11 @@ msgstr "Enemmän"
 msgid "Less"
 msgstr "Vähemmän"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Versio"
 
-#: 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 "
@@ -339,27 +339,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Kehityksestä on vastannut <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-yhteisö</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">lähdekoodi</a> on julkaistu lisenssin <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> alaisena."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Lisää sovelluksesi"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Lisää sovelluksia"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Valitse sovellus"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Katso sovellussivu osoitteessa apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lisensoija <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Päivitä"
 
@@ -387,76 +387,76 @@ msgstr "Ohjelmistovirheiden jäljitys"
 msgid "Commercial Support"
 msgstr "Kaupallinen tuki"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Käytössäsi on <strong>%s</strong>/<strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Näytä ensimmäisen käyttökerran avustaja uudelleen"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Käytössäsi on <strong>%s</strong>/<strong>%s</strong>"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Salasana"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Salasanasi vaihdettiin"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Salasanaasi ei voitu vaihtaa"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Nykyinen salasana"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Vaihda salasana"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Näyttönimi"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "Sähköpostiosoite"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Sähköpostiosoitteesi"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Kieli"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Auta kääntämisessä"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Käytä tätä osoitetta yhdistäessäsi ownCloudiisi tiedostonhallintaa käyttäen"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Kirjautumisnimi"
 
@@ -464,34 +464,40 @@ msgstr "Kirjautumisnimi"
 msgid "Create"
 msgstr "Luo"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Oletustallennustila"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Rajoittamaton"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Muu"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Tallennustila"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "vaihda näyttönimi"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "aseta uusi salasana"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Oletus"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index e2fb3a9d1e2..fb3c413aec3 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/user_webdavauth.po b/l10n/fi_FI/user_webdavauth.po
index 03611071936..f38e5770f38 100644
--- a/l10n/fi_FI/user_webdavauth.po
+++ b/l10n/fi_FI/user_webdavauth.po
@@ -8,8 +8,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV-todennus"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "Osoite: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 0be18b5c865..60057522f6e 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
 # msoko <sokolovitch@yahoo.com>, 2013
 # plachance <patlachance@gmail.com>, 2013
 # red0ne <red-0ne@smarty-concept.com>, 2013
@@ -10,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: red0ne <red-0ne@smarty-concept.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,27 +23,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "L'utilisateur %s a partagé un fichier avec vous"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "L'utilsateur %s a partagé un dossier avec vous"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "L'utilisateur %s a partagé le fichier \"%s\" avec vous. Vous pouvez le télécharger ici : %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "L'utilisateur %s a partagé le dossier \"%s\" avec vous. Il est disponible au téléchargement ici : %s"
+msgid "%s shared »%s« with you"
+msgstr "%s partagé »%s« avec vous"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -395,7 +377,7 @@ msgstr "La mise à jour a échoué. Veuillez signaler ce problème à la <a href
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "Réinitialisation de votre mot de passe Owncloud"
 
@@ -423,7 +405,19 @@ msgstr "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votr
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr "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?"
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "Oui, je veux vraiment réinitialiser mon mot de passe maintenant"
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Demander la réinitialisation"
 
@@ -471,6 +465,21 @@ msgstr "Accès interdit"
 msgid "Cloud not found"
 msgstr "Introuvable"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr "Salut,\n\nje veux juste vous signaler %s partagé %s avec vous.\nVoyez-le: %s\n\nBonne continuation!"
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "services web sous votre contrôle"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Editer les catégories"
@@ -563,16 +572,12 @@ msgstr "Serveur de la base de données"
 msgid "Finish setup"
 msgstr "Terminer l'installation"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "services web sous votre contrôle"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s est disponible. Obtenez plus d'informations sur la façon de mettre à jour."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Se déconnecter"
 
@@ -606,6 +611,13 @@ msgstr "Connexion"
 msgid "Alternative Logins"
 msgstr "Logins alternatifs"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr "Salut,<br><br>je veux juste vous signaler %s partagé »%s« avec vous.<br><a href=\"%s\">Voyez-le!</a><br><br>Bonne continuation!"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "précédent"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 52deb357fe9..a11e42440f4 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po
index 36b80d4b270..cd41efece69 100644
--- a/l10n/fr/files_encryption.po
+++ b/l10n/fr/files_encryption.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
+# froozeify <froozeify@mail.com>, 2013
 # lyly95, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-08 02:03+0200\n"
-"PO-Revision-Date: 2013-06-07 09:23+0000\n"
-"Last-Translator: lyly95\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 18:50+0000\n"
+"Last-Translator: Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,61 +46,118 @@ msgstr "Mot de passe changé avec succès "
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr "Ne peut pas changer le mot de passe. L'ancien mot de passe est peut-être incorrect."
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr "Mot de passe de la clé privé mis à jour avec succès."
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr "Impossible de mettre à jour le mot de passe de la clé privé. Peut-être que l'ancien mot de passe n'était pas correcte."
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Enregistrement..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr "Vous pouvez déverrouiller votre clé privée dans votre"
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr "paramètres personnel"
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Chiffrement"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr "Activer la clé de récupération par mots de passe de cryptage (autoriser le partage de la clé de récupération) "
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr "Rétablissement du compte mot de passe "
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr "Activer"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr "Désactiver"
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr "Changer les mots de passe de cryptage par la clé de récupération"
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr "Ancien compte de récupération de mots de passe"
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr "Nouveau compte de récupération de mots de passe"
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr "Changer de mot de passe"
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
-msgstr "Activer la récupération des mots de passe en partageant les fichiers avec votre administrateur:"
-
 #: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr "Ancien mot de passe de connexion"
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr "Actuel mot de passe de connexion"
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr "Mettre à jour le mot de passe de votre clé privée"
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr "Activer la récupération du mot de passe:"
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
-msgstr "En activant cette option cela vous autorisera à récupérer votre accès aux fichiers cryptés si votre mot de passe est perdu"
+"files in case of password loss"
+msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr "Mise à jour des paramètres de récupération de fichiers "
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr "Ne peut pas remettre à jour les fichiers de récupération"
diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po
index 89e344d9a51..425e8caf533 100644
--- a/l10n/fr/files_external.po
+++ b/l10n/fr/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index c25a8e9fb10..c70b8f4a91a 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Télécharger"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Pas d'aperçu disponible pour"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "services web sous votre contrôle"
diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po
index c3885f65175..1a32bdc4aa4 100644
--- a/l10n/fr/files_trashbin.po
+++ b/l10n/fr/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index b2ce6f5669c..2f14f999e7e 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: Cyril Glapa <kyriog@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Aide"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Personnel"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Paramètres"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Applications"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Administration"
 
@@ -114,76 +114,76 @@ msgstr "%s vous nez pouvez pas utiliser de points dans le nom de la base de donn
 msgid "%s set the database host."
 msgstr "%s spécifiez l'hôte de la base de données."
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nom d'utilisateur et/ou mot de passe de la base PostgreSQL invalide"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Vous devez spécifier soit le nom d'un compte existant, soit celui de l'administrateur."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr "La connexion Oracle ne peut pas être établie"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "Nom d'utilisateur et/ou mot de passe de la base MySQL invalide"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Erreur de la base de données : \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "La requête en cause est : \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "L'utilisateur MySQL '%s'@'localhost' existe déjà."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Retirer cet utilisateur de la base MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "L'utilisateur MySQL '%s'@'%%' existe déjà"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Retirer cet utilisateur de la base MySQL."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Nom d'utilisateur et/ou mot de passe de la base Oracle invalide"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "La requête en cause est : \"%s\", nom : %s, mot de passe : %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Le nom d'utilisateur et/ou le mot de passe de la base MS SQL est invalide : %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Veuillez vous référer au <a href='%s'>guide d'installation</a>."
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 0fd6886fed3..5b49e6f5e02 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Christophe Lherieau <skimpax@gmail.com>, 2013
+# lyly95, 2013
 # red0ne <red-0ne@smarty-concept.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: red0ne <red-0ne@smarty-concept.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: lyly95\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,7 +61,7 @@ msgstr "E-mail invalide"
 msgid "Unable to delete group"
 msgstr "Impossible de supprimer le groupe"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Impossible de supprimer l'utilisateur"
 
@@ -138,16 +139,16 @@ msgstr "annuler"
 msgid "Unable to remove user"
 msgstr "Impossible de retirer l'utilisateur"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Groupes"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Groupe Admin"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -326,11 +327,11 @@ msgstr "Plus"
 msgid "Less"
 msgstr "Moins"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Version"
 
-#: 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 "
@@ -340,27 +341,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Ajoutez votre application"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Plus d'applications…"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Sélectionner une Application"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Voir la page des applications à l'url apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "Distribué sous licence <span class=\"licence\"></span>, par <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Mettre à jour"
 
@@ -388,76 +389,76 @@ msgstr "Suivi de bugs"
 msgid "Commercial Support"
 msgstr "Support commercial"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Obtenez les applications de synchronisation de vos fichiers"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Revoir le premier lancement de l'installeur"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Mot de passe"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Votre mot de passe a été changé"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Impossible de changer votre mot de passe"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Mot de passe actuel"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Changer de mot de passe"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Nom affiché"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "Adresse mail"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Votre adresse e-mail"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Entrez votre adresse e-mail pour permettre la réinitialisation du mot de passe"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Langue"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Aidez à traduire"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Utiliser cette adresse pour vous connecter à ownCloud dans votre gestionnaire de fichiers"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Nom de la connexion"
 
@@ -465,34 +466,40 @@ msgstr "Nom de la connexion"
 msgid "Create"
 msgstr "Créer"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr "Récupération du mot de passe administrateur"
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr "Entrer le mot de passe de récupération dans le but de récupérer les fichiers utilisateurs pendant le changement de mot de passe"
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Support de stockage par défaut"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Illimité"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Autre"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Support de stockage"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "Changer le nom affiché"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "Changer le mot de passe"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Défaut"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index d3875f024da..832c098cf56 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: plachance <patlachance@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fr/user_webdavauth.po b/l10n/fr/user_webdavauth.po
index d1834912d73..592ae748bc3 100644
--- a/l10n/fr/user_webdavauth.po
+++ b/l10n/fr/user_webdavauth.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
 # Christophe Lherieau <skimpax@gmail.com>, 2013
 # mishka <mishka.lazzlo@gmail.com>, 2013
 # ouafnico <nicolas@shivaserv.fr>, 2012
@@ -12,9 +13,9 @@ 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:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 18:40+0000\n"
+"Last-Translator: Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,8 +28,8 @@ msgid "WebDAV Authentication"
 msgstr "Authentification WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL : http://"
+msgid "URL: "
+msgstr "URL: "
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index beb77651d29..6a3b815a9c5 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,27 +20,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "O usuario %s compartíu un ficheiro con vostede"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "O usuario %s compartíu un cartafol con vostede"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "O usuario %s compartiu o ficheiro «%s» con vostede. Teno dispoñíbel en: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "O usuario %s compartiu o cartafol «%s» con vostede. Teno dispoñíbel en: %s"
+msgid "%s shared »%s« with you"
+msgstr "%s compartiu «%s» con vostede"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -393,7 +374,7 @@ msgstr "A actualización non foi satisfactoria, informe deste problema á  <a hr
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "Restabelecer o contrasinal de ownCloud"
 
@@ -421,7 +402,19 @@ msgstr "Recibirá unha ligazón por correo para restabelecer o contrasinal"
 msgid "Username"
 msgstr "Nome de usuario"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr "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?"
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "Si, confirmo que quero restabelecer agora o meu contrasinal"
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Petición de restabelecemento"
 
@@ -469,6 +462,21 @@ msgstr "Acceso denegado"
 msgid "Cloud not found"
 msgstr "Nube non atopada"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr "Ola,\n\nsó facerlle saber que %s compartiu %s con vostede.\nVéxao en: %s\n\nSaúdos!"
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "servizos web baixo o seu control"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Editar as categorías"
@@ -561,16 +569,12 @@ msgstr "Servidor da base de datos"
 msgid "Finish setup"
 msgstr "Rematar a configuración"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "servizos web baixo o seu control"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s está dispoñíbel. Obteña máis información sobre como actualizar."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Desconectar"
 
@@ -604,6 +608,13 @@ msgstr "Conectar"
 msgid "Alternative Logins"
 msgstr "Accesos alternativos"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr "Ola,<br><br>só facerlle saber que %s compartiu «%s» con vostede.<br><a href=\"%s\">Véxao!</a><br><br>Saúdos!"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "anterior"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 4b2c33823b5..b4adf0248a4 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/gl/files_encryption.po b/l10n/gl/files_encryption.po
index df19cbea75f..3d0bba4e825 100644
--- a/l10n/gl/files_encryption.po
+++ b/l10n/gl/files_encryption.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-31 01:58+0200\n"
-"PO-Revision-Date: 2013-05-30 06:50+0000\n"
+"POT-Creation-Date: 2013-06-15 01:58+0200\n"
+"PO-Revision-Date: 2013-06-14 11:54+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -46,61 +46,118 @@ msgstr "O contrasinal foi cambiado satisfactoriamente"
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o  correcto."
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr "A chave privada foi actualizada correctamente."
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr "Non foi posíbel actualizar o contrasinal da chave privada. É probábel que o contrasinal antigo non sexa correcto."
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr "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"
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Gardando..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior. "
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr "Pode desbloquear a chave privada nos seus"
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr "axustes persoais"
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr "Activar a chave  de recuperación do cifrado de contrasinais (permite compartir a chave de recuperación):"
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr "Recuperación do contrasinal da conta"
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr "Activado"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr "Cambiar a chave de la recuperación do cifrado de contrasinais:"
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr "Antigo contrasinal de recuperación da conta"
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr "Novo contrasinal de recuperación da conta"
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr "Cambiar o contrasinal"
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
-msgstr "Activar a recuperación de contrasinais compartindo todos os ficheiros co administrador:"
-
 #: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr "O seu contrasinal da chave privada non coincide co seu contrasinal de acceso."
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr "Estabeleza o seu contrasinal antigo da chave de recuperación ao seu contrasinal de acceso actual"
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr " Se non lembra o seu antigo contrasinal pode pedírllelo ao seu administrador para recuperar os seus ficheiros."
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr "Contrasinal de acceso antigo"
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr "Contrasinal de acceso actual"
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr "Actualizar o contrasinal da chave privada"
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr "Activar o  contrasinal de recuperación:"
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
-msgstr "Ao activar esta opción permitiráselle volver a obter acceso aos ficheiros cifrados se perde o contrasinal"
+"files in case of password loss"
+msgstr "Ao activar esta opción permitiráselle volver a obter acceso aos ficheiros cifrados no caso de perda do contrasinal"
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr "Actualizouse o ficheiro de axustes de recuperación"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr "Non foi posíbel actualizar o ficheiro de recuperación"
diff --git a/l10n/gl/files_external.po b/l10n/gl/files_external.po
index 613d780e9be..bee61bded04 100644
--- a/l10n/gl/files_external.po
+++ b/l10n/gl/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index e9ebbc805cc..b685bae61dd 100644
--- a/l10n/gl/files_sharing.po
+++ b/l10n/gl/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Descargar"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Sen vista previa dispoñíbel para"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "servizos web baixo o seu control"
diff --git a/l10n/gl/files_trashbin.po b/l10n/gl/files_trashbin.po
index d684a659d21..a4d9a8e87e2 100644
--- a/l10n/gl/files_trashbin.po
+++ b/l10n/gl/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index de8c6f38111..243d499047f 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Axuda"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Persoal"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Axustes"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Usuarios"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Aplicativos"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Administración"
 
@@ -114,76 +114,76 @@ msgstr "%s non se poden empregar puntos na base de datos"
 msgid "%s set the database host."
 msgstr "%s estabeleza o servidor da base de datos"
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nome de usuario e/ou contrasinal de PostgreSQL incorrecto"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Deberá introducir unha conta existente ou o administrador."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr "Non foi posíbel estabelecer a conexión con Oracle"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "Nome de usuario e/ou contrasinal de MySQL incorrecto"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Produciuse un erro na base de datos: «%s»"
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "A orde ofensiva foi: «%s»"
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "O usuario MySQL  '%s'@'localhost' xa existe."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Omitir este usuario de MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "O usuario MySQL «%s»@«%%» xa existe."
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Omitir este usuario de MySQL."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Nome de usuario e/ou contrasinal de Oracle incorrecto"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "A orde ofensiva foi: «%s», nome: %s, contrasinal: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Nome de usuario e/ou contrasinal de MS SQL incorrecto: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "O seu servidor web non está aínda configurado adecuadamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Volva comprobar as <a href='%s'>guías de instalación</a>"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 8ad76aba5df..76b1d05278e 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -59,7 +59,7 @@ msgstr "Correo incorrecto"
 msgid "Unable to delete group"
 msgstr "Non é posíbel eliminar o grupo."
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Non é posíbel eliminar o usuario"
 
@@ -137,16 +137,16 @@ msgstr "desfacer"
 msgid "Unable to remove user"
 msgstr "Non é posíbel retirar o usuario"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Grupo Admin"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -325,11 +325,11 @@ msgstr "Máis"
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Versión"
 
-#: 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 "
@@ -339,27 +339,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Desenvolvido pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está baixo a licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Engada o seu aplicativo"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Máis aplicativos"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Escolla un aplicativo"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Consulte a páxina do aplicativo en apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenciado por<span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Actualizar"
 
@@ -387,76 +387,76 @@ msgstr "Seguemento de fallos"
 msgid "Commercial Support"
 msgstr "Asistencia comercial"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Ten en uso <strong>%s</strong> do total dispoñíbel de <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Obteña os aplicativos para sincronizar os seus ficheiros"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Amosar o axudante da primeira execución outra vez"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Ten en uso <strong>%s</strong> do total dispoñíbel de <strong>%s</strong>"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Contrasinal"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "O seu contrasinal foi cambiado"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Non é posíbel cambiar o seu contrasinal"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Contrasinal actual"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Novo contrasinal"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Cambiar o contrasinal"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Amosar o nome"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "Correo"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "O seu enderezo de correo"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
-msgstr "Escriba un enderezo de correo para activar a recuperación do contrasinal"
+msgstr "Escriba un enderezo de correo para activar o contrasinal de recuperación"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Axude na tradución"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Utilice este enderezo para conectarse ao seu ownCloud co administrador de ficheiros"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Nome de acceso"
 
@@ -464,34 +464,40 @@ msgstr "Nome de acceso"
 msgid "Create"
 msgstr "Crear"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
-msgstr "Recuperación do contrasinal do administrador"
+msgstr "Contrasinal de recuperación do administrador"
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr "Introduza o contrasinal de recuperación para recuperar os ficheiros dos usuarios durante o cambio de contrasinal"
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Almacenamento predeterminado"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Sen límites"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Almacenamento"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "cambiar o nome visíbel"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "estabelecer un novo contrasinal"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Predeterminado"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 1076935be86..9cb0067315e 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/gl/user_webdavauth.po b/l10n/gl/user_webdavauth.po
index 779cbf82bae..d92c173664b 100644
--- a/l10n/gl/user_webdavauth.po
+++ b/l10n/gl/user_webdavauth.po
@@ -11,9 +11,9 @@ 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:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-16 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 09:10+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,8 +26,8 @@ msgid "WebDAV Authentication"
 msgstr "Autenticación WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr "URL: "
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 89731dad0c4..4da2e8d2417 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,27 +20,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "המשתמש %s שיתף אתך קובץ"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "המשתמש %s שיתף אתך תיקייה"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "המשתמש %s שיתף אתך את הקובץ „%s“. ניתן להוריד את הקובץ מכאן: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "המשתמש %s שיתף אתך את התיקייה „%s“. ניתן להוריד את התיקייה מכאן: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -393,7 +374,7 @@ msgstr "תהליך העדכון לא הושלם בהצלחה. נא דווח את
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "איפוס הססמה של ownCloud"
 
@@ -421,7 +402,19 @@ msgstr "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הסס
 msgid "Username"
 msgstr "שם משתמש"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "בקשת איפוס"
 
@@ -469,6 +462,21 @@ msgstr "הגישה נחסמה"
 msgid "Cloud not found"
 msgstr "ענן לא נמצא"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "שירותי רשת תחת השליטה שלך"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "ערוך קטגוריות"
@@ -561,16 +569,12 @@ msgstr "שרת בסיס נתונים"
 msgid "Finish setup"
 msgstr "סיום התקנה"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "שירותי רשת תחת השליטה שלך"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s זמינה להורדה. ניתן ללחוץ כדי לקבל מידע נוסף כיצד לעדכן."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "התנתקות"
 
@@ -604,6 +608,13 @@ msgstr "כניסה"
 msgid "Alternative Logins"
 msgstr "כניסות אלטרנטיביות"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "הקודם"
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 1986ca3e103..18cd618e1cf 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/he/files_encryption.po b/l10n/he/files_encryption.po
index d2120666022..6cf193359f1 100644
--- a/l10n/he/files_encryption.po
+++ b/l10n/he/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "שמירה…"
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "הצפנה"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/he/files_external.po b/l10n/he/files_external.po
index 59b59768f6b..8e5767e3f6c 100644
--- a/l10n/he/files_external.po
+++ b/l10n/he/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
index b4798850349..9b6989e0afe 100644
--- a/l10n/he/files_sharing.po
+++ b/l10n/he/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "הורדה"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "אין תצוגה מקדימה זמינה עבור"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "שירותי רשת תחת השליטה שלך"
diff --git a/l10n/he/files_trashbin.po b/l10n/he/files_trashbin.po
index 6933c837980..21283f34221 100644
--- a/l10n/he/files_trashbin.po
+++ b/l10n/he/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
index 4a4693a1b45..e01197a81e4 100644
--- a/l10n/he/lib.po
+++ b/l10n/he/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "עזרה"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "אישי"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "הגדרות"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "משתמשים"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "יישומים"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "מנהל"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "שרת האינטרנט שלך אינו מוגדר לצורכי סנכרון קבצים עדיין כיוון שמנשק ה־WebDAV כנראה אינו תקין."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "נא לעיין שוב ב<a href='%s'>מדריכי ההתקנה</a>."
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 8a2b03237aa..0c4f82a99b3 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,7 +59,7 @@ msgstr "דוא״ל לא חוקי"
 msgid "Unable to delete group"
 msgstr "לא ניתן למחוק את הקבוצה"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "לא ניתן למחוק את המשתמש"
 
@@ -137,16 +137,16 @@ msgstr "ביטול"
 msgid "Unable to remove user"
 msgstr "לא ניתן להסיר את המשתמש"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "קבוצות"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "מנהל הקבוצה"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "מחיקה"
 
@@ -325,11 +325,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 "
@@ -339,27 +339,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "פותח על די <a href=\"http://ownCloud.org/contact\" target=\"_blank\">קהילתownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">קוד המקור</a> מוגן ברישיון <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: 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 "צפה בעמוד הישום ב apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "ברישיון <span class=\"licence\"></span>לטובת <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "עדכון"
 
@@ -387,76 +387,76 @@ msgstr "עוקב תקלות"
 msgid "Commercial Support"
 msgstr "תמיכה בתשלום"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> הזמינים לך"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "השג את האפליקציות על מנת לסנכרן את הקבצים שלך"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "הצגת אשף ההפעלה הראשונית שוב"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> הזמינים לך"
+
+#: 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:81
+#: 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 "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "השתמש בכתובת זאת על מנת להתחבר אל ownCloud דרך סייר קבצים."
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "שם כניסה"
 
@@ -464,34 +464,40 @@ msgstr "שם כניסה"
 msgid "Create"
 msgstr "יצירה"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr "ססמת השחזור של המנהל"
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "אחסון בררת המחדל"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "ללא הגבלה"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "אחר"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "אחסון"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "החלפת שם התצוגה"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "הגדרת ססמה חדשה"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "בררת מחדל"
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index 272e5848a00..97bcdfc102f 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/he/user_webdavauth.po b/l10n/he/user_webdavauth.po
index 8d99fe3f582..ac898b74676 100644
--- a/l10n/he/user_webdavauth.po
+++ b/l10n/he/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-08 02:03+0200\n"
-"PO-Revision-Date: 2013-06-07 09:20+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,8 +23,8 @@ msgid "WebDAV Authentication"
 msgstr "הזדהות מול WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "כתובת: http://‎"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index ed462ff5edb..73d0d4abf42 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
-"Last-Translator: rktaiwala <rktaiwala@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,26 +20,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "उपयोगकर्ता %s ने आप के साथ एक फ़ाइल सहभाजीत किया"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -393,7 +374,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -421,7 +402,19 @@ msgstr "पासवर्ड बदलने कि लिंक आपको �
 msgid "Username"
 msgstr "प्रयोक्ता का नाम"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr ""
 
@@ -469,6 +462,21 @@ msgstr ""
 msgid "Cloud not found"
 msgstr "क्लौड नहीं मिला "
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr ""
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -561,16 +569,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr "सेटअप समाप्त करे"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr ""
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "लोग  आउट"
 
@@ -604,6 +608,13 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "पिछला"
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index 0c037bf515c..c350a08e026 100644
--- a/l10n/hi/files.po
+++ b/l10n/hi/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hi/files_encryption.po b/l10n/hi/files_encryption.po
index 1b6ebe3c001..68a91c9baf0 100644
--- a/l10n/hi/files_encryption.po
+++ b/l10n/hi/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/hi/files_sharing.po b/l10n/hi/files_sharing.po
index 5a9ccbc09ed..cb9b4a99392 100644
--- a/l10n/hi/files_sharing.po
+++ b/l10n/hi/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-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:47+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr ""
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr ""
diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po
index cc59336602e..2da36dc45e0 100644
--- a/l10n/hi/lib.po
+++ b/l10n/hi/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 00:02+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "सहयोग"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "यक्तिगत"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "सेटिंग्स"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "उपयोगकर्ता"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr ""
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index c81fb256e3b..3f1dc098e5a 100644
--- a/l10n/hi/settings.po
+++ b/l10n/hi/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-05-25 02:02+0200\n"
-"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"POT-Creation-Date: 2013-06-11 01:57+0200\n"
+"PO-Revision-Date: 2013-06-10 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr ""
 
@@ -324,11 +324,11 @@ msgstr ""
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "पासवर्ड"
 
@@ -423,39 +423,39 @@ msgstr "नया पासवर्ड"
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:56 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:71
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/hi/user_webdavauth.po b/l10n/hi/user_webdavauth.po
index 712626e49c0..25d78227a57 100644
--- a/l10n/hi/user_webdavauth.po
+++ b/l10n/hi/user_webdavauth.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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 1925fe8df82..c32f80d8baa 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,26 +19,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "ownCloud resetiranje lozinke"
 
@@ -420,7 +401,19 @@ msgstr "Primit ćete link kako biste poništili zaporku putem e-maila."
 msgid "Username"
 msgstr "Korisničko ime"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Zahtjev za resetiranjem"
 
@@ -468,6 +461,21 @@ msgstr "Pristup zabranjen"
 msgid "Cloud not found"
 msgstr "Cloud nije pronađen"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "web usluge pod vašom kontrolom"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Uredi kategorije"
@@ -560,16 +568,12 @@ msgstr "Poslužitelj baze podataka"
 msgid "Finish setup"
 msgstr "Završi postavljanje"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "web usluge pod vašom kontrolom"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Odjava"
 
@@ -603,6 +607,13 @@ msgstr "Prijava"
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "prethodan"
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index 28fc762e07a..ab952641e79 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hr/files_encryption.po b/l10n/hr/files_encryption.po
index bbff99c9b09..4dfef45fc0e 100644
--- a/l10n/hr/files_encryption.po
+++ b/l10n/hr/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Spremanje..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/hr/files_external.po b/l10n/hr/files_external.po
index 47be78fbc68..4ac6471dfd6 100644
--- a/l10n/hr/files_external.po
+++ b/l10n/hr/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
index 45e0f77b1be..b2832d057e8 100644
--- a/l10n/hr/files_sharing.po
+++ b/l10n/hr/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Preuzimanje"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "web usluge pod vašom kontrolom"
diff --git a/l10n/hr/files_trashbin.po b/l10n/hr/files_trashbin.po
index c7fbdfe0dd4..c30f04d69ef 100644
--- a/l10n/hr/files_trashbin.po
+++ b/l10n/hr/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po
index ab38bad668b..a0edfdf5846 100644
--- a/l10n/hr/lib.po
+++ b/l10n/hr/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Pomoć"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Osobno"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Postavke"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Korisnici"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Aplikacije"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Administrator"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index bc44c9a00e8..70665b01e95 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr "Neispravan email"
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr ""
 
@@ -136,16 +136,16 @@ msgstr "vrati"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Grupe"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Grupa Admin"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Obriši"
 
@@ -324,11 +324,11 @@ msgstr "više"
 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 "Dodajte vašu aplikaciju"
 
-#: 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 "Odaberite Aplikaciju"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Pogledajte stranicu s aplikacijama na apps.owncloud.com"
 
-#: 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
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Lozinka"
 
-#: 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 "Nemoguće promijeniti lozinku"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Trenutna lozinka"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nova lozinka"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Izmjena lozinke"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "e-mail adresa"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Vaša e-mail adresa"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Ispunite vase e-mail adresa kako bi se omogućilo oporavak lozinke"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Jezik"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Pomoć prevesti"
 
-#: 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:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr "Izradi"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "ostali"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index 601a1c0d456..bc2bca5fcd2 100644
--- a/l10n/hr/user_ldap.po
+++ b/l10n/hr/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hr/user_webdavauth.po b/l10n/hr/user_webdavauth.po
index bc4382e068d..b0b3a830c3a 100644
--- a/l10n/hr/user_webdavauth.po
+++ b/l10n/hr/user_webdavauth.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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 0f7f933a577..d4cffe14ed2 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,27 +20,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "%s felhasználó megosztott Önnel egy fájlt"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "%s felhasználó megosztott Önnel egy mappát"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "%s felhasználó megosztotta ezt az állományt Önnel: %s. A fájl innen tölthető le: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "%s felhasználó megosztotta ezt a mappát Önnel: %s. A mappa innen tölthető le: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -393,7 +374,7 @@ msgstr "A frissítés nem sikerült. Kérem értesítse erről a problémáról
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "ownCloud jelszó-visszaállítás"
 
@@ -421,7 +402,19 @@ msgstr "Egy emailben fog értesítést kapni a jelszóbeállítás módjáról."
 msgid "Username"
 msgstr "Felhasználónév"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Visszaállítás igénylése"
 
@@ -469,6 +462,21 @@ msgstr "A hozzáférés nem engedélyezett"
 msgid "Cloud not found"
 msgstr "A felhő nem található"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "webszolgáltatások saját kézben"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Kategóriák szerkesztése"
@@ -561,16 +569,12 @@ msgstr "Adatbázis szerver"
 msgid "Finish setup"
 msgstr "A beállítások befejezése"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "webszolgáltatások saját kézben"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s rendelkezésre áll. További információ a frissítéshez."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Kilépés"
 
@@ -604,6 +608,13 @@ msgstr "Bejelentkezés"
 msgid "Alternative Logins"
 msgstr "Alternatív bejelentkezés"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "előző"
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index a4d374448e7..16ea4a1c62e 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/files_encryption.po b/l10n/hu_HU/files_encryption.po
index 643b0404816..2d5ccff9cf1 100644
--- a/l10n/hu_HU/files_encryption.po
+++ b/l10n/hu_HU/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Mentés..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Titkosítás"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/hu_HU/files_external.po b/l10n/hu_HU/files_external.po
index 36ee16c2ec0..f0b2399ce5a 100644
--- a/l10n/hu_HU/files_external.po
+++ b/l10n/hu_HU/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index 0ee75166082..3bac7359768 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Letöltés"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Nem áll rendelkezésre előnézet ehhez: "
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "webszolgáltatások saját kézben"
diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po
index b534563b701..863e29b6752 100644
--- a/l10n/hu_HU/files_trashbin.po
+++ b/l10n/hu_HU/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po
index 1f3ef9be7be..a8326b1bb33 100644
--- a/l10n/hu_HU/lib.po
+++ b/l10n/hu_HU/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Súgó"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Személyes"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Beállítások"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Felhasználók"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Alkalmazások"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Adminsztráció"
 
@@ -114,76 +114,76 @@ msgstr "%s az adatbázis neve nem tartalmazhat pontot"
 msgid "%s set the database host."
 msgstr "%s adja meg az adatbázist szolgáltató számítógép nevét."
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "A PostgreSQL felhasználói név és/vagy jelszó érvénytelen"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Vagy egy létező felhasználó vagy az adminisztrátor bejelentkezési nevét kell megadnia"
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr "Az Oracle kapcsolat nem hozható létre"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "A MySQL felhasználói név és/vagy jelszó érvénytelen"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Adatbázis hiba: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "A hibát ez a parancs okozta: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "A '%s'@'localhost' MySQL felhasználó már létezik."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Törölje ezt a felhasználót a MySQL-ből"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "A '%s'@'%%' MySQL felhasználó már létezik"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Törölje ezt a felhasználót a MySQL-ből."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Az Oracle felhasználói név és/vagy jelszó érvénytelen"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "A hibát okozó parancs ez volt: \"%s\", login név: %s, jelszó: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Az MS SQL felhasználónév és/vagy jelszó érvénytelen: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>."
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 24a15944185..e3392c2e671 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: Adam Toth <adazlord@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,7 +60,7 @@ msgstr "Hibás email"
 msgid "Unable to delete group"
 msgstr "A csoport nem törölhető"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "A felhasználó nem törölhető"
 
@@ -138,16 +138,16 @@ msgstr "visszavonás"
 msgid "Unable to remove user"
 msgstr "A felhasználót nem sikerült eltávolítáni"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Csoportok"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Csoportadminisztrátor"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Törlés"
 
@@ -326,11 +326,11 @@ msgstr "Több"
 msgid "Less"
 msgstr "Kevesebb"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Verzió"
 
-#: 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 "
@@ -340,27 +340,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "A programot az <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud közösség</a> fejleszti. A <a href=\"https://github.com/owncloud\" target=\"_blank\">forráskód</a> az <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> feltételei mellett használható föl."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Az alkalmazás hozzáadása"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "További alkalmazások"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Válasszon egy alkalmazást"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Lásd apps.owncloud.com, alkalmazások oldal"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-a jogtuladonos <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Frissítés"
 
@@ -388,76 +388,76 @@ msgstr "Hibabejelentések"
 msgid "Commercial Support"
 msgstr "Megvásárolható támogatás"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Az Ön tárterület-felhasználása jelenleg: <strong>%s</strong>. Maximálisan ennyi áll rendelkezésére: <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Töltse le az állományok szinkronizációjához szükséges programokat"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Nézzük meg újra az első bejelentkezéskori segítséget!"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Az Ön tárterület-felhasználása jelenleg: <strong>%s</strong>. Maximálisan ennyi áll rendelkezésére: <strong>%s</strong>"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Jelszó"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "A jelszava megváltozott"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "A jelszó nem változtatható meg"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "A jelenlegi jelszó"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Az új jelszó"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "A jelszó megváltoztatása"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "A megjelenített név"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Az Ön email címe"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Adja meg az email címét, hogy jelszó-emlékeztetőt kérhessen, ha elfelejtette a jelszavát!"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Nyelv"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Segítsen a fordításban!"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Ennek a címnek a megadásával a WebDAV-protokollon keresztül saját gépének fájlkezelőjével is is elérheti az állományait."
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Bejelentkezési név"
 
@@ -465,34 +465,40 @@ msgstr "Bejelentkezési név"
 msgid "Create"
 msgstr "Létrehozás"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr "A jelszóvisszaállítás adminisztrációja"
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Alapértelmezett tárhely"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Korlátlan"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Más"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Tárhely"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "a megjelenített név módosítása"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "új jelszó beállítása"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Alapértelmezett"
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index a19bd05493f..b9fa5bf281b 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/user_webdavauth.po b/l10n/hu_HU/user_webdavauth.po
index e2056a92caf..1d74be6d3f9 100644
--- a/l10n/hu_HU/user_webdavauth.po
+++ b/l10n/hu_HU/user_webdavauth.po
@@ -8,8 +8,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV hitelesítés"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index e738115c1e4..23d6a9c882b 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/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-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-14 23:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -19,26 +19,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -216,23 +197,23 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr ""
 
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -420,7 +401,19 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr ""
 
@@ -468,6 +461,21 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr ""
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -560,16 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr ""
-
-#: templates/layout.user.php:36
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:61
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr ""
 
@@ -603,6 +607,13 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr ""
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index 4712f97e456..7322202bfa7 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hy/files_encryption.po b/l10n/hy/files_encryption.po
index a16e27d574b..6502e4208c4 100644
--- a/l10n/hy/files_encryption.po
+++ b/l10n/hy/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/hy/files_external.po b/l10n/hy/files_external.po
index f4a5b7fcb62..6d57f2329e2 100644
--- a/l10n/hy/files_external.po
+++ b/l10n/hy/files_external.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
 "PO-Revision-Date: 2013-04-26 08:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
index ea15661c4f1..d4db75d1a7f 100644
--- a/l10n/hy/files_sharing.po
+++ b/l10n/hy/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,7 +42,3 @@ msgstr "Բեռնել"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr ""
diff --git a/l10n/hy/files_trashbin.po b/l10n/hy/files_trashbin.po
index b0a9624f7b6..da63a288599 100644
--- a/l10n/hy/files_trashbin.po
+++ b/l10n/hy/files_trashbin.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
 "PO-Revision-Date: 2013-04-26 08:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index e66b48b5133..477a941c98f 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\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 ""
 
@@ -136,16 +136,16 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 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
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: 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:81
+#: 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:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Այլ"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/hy/user_webdavauth.po b/l10n/hy/user_webdavauth.po
index 101ab76c34c..497f2fbc293 100644
--- a/l10n/hy/user_webdavauth.po
+++ b/l10n/hy/user_webdavauth.po
@@ -7,9 +7,9 @@ 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: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index b28c250643b..6d4136c3582 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -19,26 +19,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "Reinitialisation del contrasigno de ownCLoud"
 
@@ -420,7 +401,19 @@ msgstr ""
 msgid "Username"
 msgstr "Nomine de usator"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Requestar reinitialisation"
 
@@ -468,6 +461,21 @@ msgstr "Accesso prohibite"
 msgid "Cloud not found"
 msgstr "Nube non trovate"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "servicios web sub tu controlo"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Modificar categorias"
@@ -560,16 +568,12 @@ msgstr "Hospite de base de datos"
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "servicios web sub tu controlo"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Clauder le session"
 
@@ -603,6 +607,13 @@ msgstr "Aperir session"
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "prev"
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 3a1934e37bd..a2e22c8365a 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ia/files_encryption.po b/l10n/ia/files_encryption.po
index 37c50e27483..d9d181238e0 100644
--- a/l10n/ia/files_encryption.po
+++ b/l10n/ia/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ia/files_external.po b/l10n/ia/files_external.po
index 6759aeb2e0b..05b36d8a3da 100644
--- a/l10n/ia/files_external.po
+++ b/l10n/ia/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
index 46605ef5fb9..d2b7155a17f 100644
--- a/l10n/ia/files_sharing.po
+++ b/l10n/ia/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Discargar"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "servicios web sub tu controlo"
diff --git a/l10n/ia/files_trashbin.po b/l10n/ia/files_trashbin.po
index 05b31984465..db9d5df424c 100644
--- a/l10n/ia/files_trashbin.po
+++ b/l10n/ia/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ia/lib.po b/l10n/ia/lib.po
index d4974143bf6..9b4d5b14196 100644
--- a/l10n/ia/lib.po
+++ b/l10n/ia/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Adjuta"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Configurationes"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Usatores"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Applicationes"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Administration"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 432eb89c63a..ea14e705989 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\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 ""
 
@@ -136,16 +136,16 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Gruppos"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Deler"
 
@@ -324,11 +324,11 @@ msgstr "Plus"
 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 "Adder tu application"
 
-#: 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 "Selectionar un app"
 
-#: 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 "Actualisar"
 
@@ -386,76 +386,76 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Obtene le apps (applicationes) pro synchronizar tu files"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Contrasigno"
 
-#: 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 "Non pote cambiar tu contrasigno"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Contrasigno currente"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nove contrasigno"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Cambiar contrasigno"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "E-posta"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Tu adresse de e-posta"
 
-#: 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 "Linguage"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Adjuta a traducer"
 
-#: 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:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr "Crear"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Altere"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index 24f9ef7f55f..7efd0a6b9dd 100644
--- a/l10n/ia/user_ldap.po
+++ b/l10n/ia/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ia/user_webdavauth.po b/l10n/ia/user_webdavauth.po
index a91b0b25c8c..e9996727a39 100644
--- a/l10n/ia/user_webdavauth.po
+++ b/l10n/ia/user_webdavauth.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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/id/core.po b/l10n/id/core.po
index f4ece7889e2..52c936308b9 100644
--- a/l10n/id/core.po
+++ b/l10n/id/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "%s berbagi berkas dengan Anda"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "%s berbagi folder dengan Anda"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "%s berbagi berkas \"%s\" dengan Anda. Silakan unduh di sini: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "%s berbagi folder \"%s\" dengan Anda. Silakan unduh di sini: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -392,7 +373,7 @@ msgstr "Pembaruan gagal. Silakan laporkan masalah ini ke <a href=\"https://githu
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "Setel ulang sandi ownCloud"
 
@@ -420,7 +401,19 @@ msgstr "Anda akan menerima tautan penyetelan ulang sandi lewat Email."
 msgid "Username"
 msgstr "Nama pengguna"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Ajukan penyetelan ulang"
 
@@ -468,6 +461,21 @@ msgstr "Akses ditolak"
 msgid "Cloud not found"
 msgstr "Cloud tidak ditemukan"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "layanan web dalam kontrol Anda"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Edit kategori"
@@ -560,16 +568,12 @@ msgstr "Host basis data"
 msgid "Finish setup"
 msgstr "Selesaikan instalasi"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "layanan web dalam kontrol Anda"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Keluar"
 
@@ -603,6 +607,13 @@ msgstr "Masuk"
 msgid "Alternative Logins"
 msgstr "Cara Alternatif untuk Masuk"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "sebelumnya"
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 8c524f26f6b..9c620f02a45 100644
--- a/l10n/id/files.po
+++ b/l10n/id/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/id/files_encryption.po b/l10n/id/files_encryption.po
index 573bf66a00a..ddf864b3340 100644
--- a/l10n/id/files_encryption.po
+++ b/l10n/id/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Menyimpan..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Enkripsi"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/id/files_external.po b/l10n/id/files_external.po
index 48028991662..ecc410594ec 100644
--- a/l10n/id/files_external.po
+++ b/l10n/id/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index 1af81ed21b6..4e6c4eb7e1f 100644
--- a/l10n/id/files_sharing.po
+++ b/l10n/id/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Unduh"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Tidak ada pratinjau tersedia untuk"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "layanan web dalam kontrol Anda"
diff --git a/l10n/id/files_trashbin.po b/l10n/id/files_trashbin.po
index 998d3891f20..961618e64da 100644
--- a/l10n/id/files_trashbin.po
+++ b/l10n/id/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index f7da35bc96f..2d94c914d40 100644
--- a/l10n/id/lib.po
+++ b/l10n/id/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Bantuan"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Pribadi"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Setelan"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Pengguna"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Aplikasi"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Admin"
 
@@ -113,76 +113,76 @@ msgstr "%sAnda tidak boleh menggunakan karakter titik pada nama basis data"
 msgid "%s set the database host."
 msgstr "%s setel host basis data."
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nama pengguna dan/atau sandi PostgreSQL tidak valid"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Anda harus memasukkan akun yang sudah ada atau administrator."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "Nama pengguna dan/atau sandi MySQL tidak valid"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Galat Basis Data: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Perintah yang bermasalah: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Pengguna MySQL '%s'@'localhost' sudah ada."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Hapus pengguna ini dari MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Pengguna MySQL '%s'@'%%' sudah ada."
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Hapus pengguna ini dari MySQL."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Nama pengguna dan/atau sandi Oracle tidak valid"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Perintah yang bermasalah: \"%s\", nama pengguna: %s, sandi: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Nama pengguna dan/atau sandi MySQL tidak valid: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Silakan periksa ulang <a href='%s'>panduan instalasi</a>."
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index b98b4a091d8..47e09a2f55c 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr "Email tidak valid"
 msgid "Unable to delete group"
 msgstr "Tidak dapat menghapus grup"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Tidak dapat menghapus pengguna"
 
@@ -136,16 +136,16 @@ msgstr "urungkan"
 msgid "Unable to remove user"
 msgstr "Tidak dapat menghapus pengguna"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Grup"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Admin Grup"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Hapus"
 
@@ -324,11 +324,11 @@ msgstr "Lainnya"
 msgid "Less"
 msgstr "Ciutkan"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Versi"
 
-#: 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 "Dikembangkan oleh <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitas ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kode sumber</a> dilisensikan di bawah <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Tambahkan Aplikasi Anda"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Aplikasi Lainnya"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Pilih Aplikasi"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Lihat halaman aplikasi di apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-dilisensikan oleh <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Perbarui"
 
@@ -386,76 +386,76 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Dukungan Komersial"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Anda telah menggunakan <strong>%s</strong> dari total <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Dapatkan aplikasi untuk sinkronisasi berkas Anda"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Tampilkan Penuntun Konfigurasi Awal"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Anda telah menggunakan <strong>%s</strong> dari total <strong>%s</strong>"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Sandi"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Sandi Anda telah diubah"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Gagal mengubah sandi Anda"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Sandi saat ini"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Sandi baru"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Ubah sandi"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Nama Tampilan"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Alamat email Anda"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Masukkan alamat email untuk mengaktifkan pemulihan sandi"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Bahasa"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Bantu menerjemahkan"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Gunakan alamat ini untuk terhubung ke ownCloud Anda pada manajer berkas "
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Nama Masuk"
 
@@ -463,34 +463,40 @@ msgstr "Nama Masuk"
 msgid "Create"
 msgstr "Buat"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Penyimpanan Baku"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Tak terbatas"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Lainnya"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Penyimpanan"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "ubah nama tampilan"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "setel sandi baru"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Baku"
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index a64155a0c21..d7e3f6b7a7b 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/id/user_webdavauth.po b/l10n/id/user_webdavauth.po
index f4b9d4b50e5..b411106f5f6 100644
--- a/l10n/id/user_webdavauth.po
+++ b/l10n/id/user_webdavauth.po
@@ -8,8 +8,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "WebDAV Authentication"
 msgstr "Otentikasi WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/is/core.po b/l10n/is/core.po
index ef5b0a92cab..43976981af6 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
-"Last-Translator: Magnus Magnusson <maggiymir@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,27 +20,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "Notandinn %s deildi skrá með þér"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "Notandinn %s deildi möppu með þér"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "Notandinn %s deildi skránni \"%s\" með þér. Hægt er að hlaða henni niður hér: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "Notandinn %s deildi möppunni \"%s\" með þér. Hægt er að hlaða henni niður hér: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -393,7 +374,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Uppfærslan heppnaðist. Beini þér til ownCloud nú."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "endursetja ownCloud lykilorð"
 
@@ -421,7 +402,19 @@ msgstr "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið.
 msgid "Username"
 msgstr "Notendanafn"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Endursetja lykilorð"
 
@@ -469,6 +462,21 @@ msgstr "Aðgangur bannaður"
 msgid "Cloud not found"
 msgstr "Ský finnst ekki"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "vefþjónusta undir þinni stjórn"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Breyta flokkum"
@@ -561,16 +569,12 @@ msgstr "Netþjónn gagnagrunns"
 msgid "Finish setup"
 msgstr "Virkja uppsetningu"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "vefþjónusta undir þinni stjórn"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s er til boða. Fáðu meiri upplýsingar um hvernig þú uppfærir."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Útskrá"
 
@@ -604,6 +608,13 @@ msgstr "<strong>Skrá inn</strong>"
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "fyrra"
diff --git a/l10n/is/files.po b/l10n/is/files.po
index 61720446f81..3c549dc287d 100644
--- a/l10n/is/files.po
+++ b/l10n/is/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/is/files_encryption.po b/l10n/is/files_encryption.po
index 1d993ab3369..bc701a2d416 100644
--- a/l10n/is/files_encryption.po
+++ b/l10n/is/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Er að vista ..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Dulkóðun"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/is/files_external.po b/l10n/is/files_external.po
index 119517324d2..c2b17a237ea 100644
--- a/l10n/is/files_external.po
+++ b/l10n/is/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/is/files_sharing.po b/l10n/is/files_sharing.po
index e5952a1e858..39f16a12a2d 100644
--- a/l10n/is/files_sharing.po
+++ b/l10n/is/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Niðurhal"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Yfirlit ekki í boði fyrir"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "vefþjónusta undir þinni stjórn"
diff --git a/l10n/is/files_trashbin.po b/l10n/is/files_trashbin.po
index 2bff349b493..c262f306441 100644
--- a/l10n/is/files_trashbin.po
+++ b/l10n/is/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/is/lib.po b/l10n/is/lib.po
index b233dcf53ef..7e563e2f980 100644
--- a/l10n/is/lib.po
+++ b/l10n/is/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Hjálp"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Um mig"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Stillingar"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Notendur"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Forrit"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Stjórnun"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index 3d95c0bb2b2..67e96ee2034 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: Magnus Magnusson <maggiymir@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,7 +59,7 @@ msgstr "Ógilt netfang"
 msgid "Unable to delete group"
 msgstr "Ekki tókst að eyða hóp"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Ekki tókst að eyða notenda"
 
@@ -137,16 +137,16 @@ msgstr "afturkalla"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Hópar"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Hópstjóri"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Eyða"
 
@@ -325,11 +325,11 @@ msgstr "Meira"
 msgid "Less"
 msgstr "Minna"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Útgáfa"
 
-#: 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 "
@@ -339,27 +339,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Þróað af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud samfélaginu</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">forrita kóðinn</a> er skráðu með <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Bæta við forriti"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Fleiri forrit"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Veldu forrit"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Skoða síðu forrits hjá apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-leyfi skráð af <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Uppfæra"
 
@@ -387,76 +387,76 @@ msgstr "Villubókhald"
 msgid "Commercial Support"
 msgstr "Borgaður stuðningur"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Þú hefur notað <strong>%s</strong> af tiltæku <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Þú hefur notað <strong>%s</strong> af tiltæku <strong>%s</strong>"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Lykilorð"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Lykilorði þínu hefur verið breytt"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Ekki tókst að breyta lykilorðinu þínu"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Núverandi lykilorð"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nýtt lykilorð"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Breyta lykilorði"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Vísa nafn"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "Netfang"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Netfangið þitt"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Sláðu inn netfangið þitt til að virkja endurheimt á lykilorði"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Tungumál"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Hjálpa við þýðingu"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Notaðu þessa vefslóð til að tengjast ownCloud svæðinu þínu"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -464,34 +464,40 @@ msgstr ""
 msgid "Create"
 msgstr "Búa til"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Sjálfgefin gagnageymsla"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Ótakmarkað"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Annað"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "gagnapláss"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Sjálfgefið"
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index f419bf02c32..ada7146a754 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: Magnus Magnusson <maggiymir@gmail.com>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/is/user_webdavauth.po b/l10n/is/user_webdavauth.po
index a771de8f67c..d6a3dc156d8 100644
--- a/l10n/is/user_webdavauth.po
+++ b/l10n/is/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-08 02:03+0200\n"
-"PO-Revision-Date: 2013-06-07 09:20+0000\n"
-"Last-Translator: Magnus Magnusson <maggiymir@gmail.com>\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,8 +24,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV Auðkenni"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "Vefslóð: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 954a035ef7c..7ca5c176e2c 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# idetao <marcxosm@gmail.com>, 2013
 # Vincenzo Reale <vinx.reale@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: idetao <marcxosm@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,27 +21,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "L'utente %s ha condiviso un file con te"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "L'utente %s ha condiviso una cartella con te"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "L'utente %s ha condiviso il file \"%s\" con te. È disponibile per lo scaricamento qui: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "L'utente %s ha condiviso la cartella \"%s\" con te. È disponibile per lo scaricamento qui: %s"
+msgid "%s shared »%s« with you"
+msgstr "%s condiviso »%s« con te"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -393,7 +375,7 @@ msgstr "L'aggiornamento non è riuscito. Segnala il problema alla <a href=\"http
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "Ripristino password di ownCloud"
 
@@ -421,7 +403,19 @@ msgstr "Riceverai un collegamento per ripristinare la tua password via email"
 msgid "Username"
 msgstr "Nome utente"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr "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?"
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "Sì, voglio davvero resettare la mia password adesso"
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Richiesta di ripristino"
 
@@ -469,6 +463,21 @@ msgstr "Accesso negato"
 msgid "Cloud not found"
 msgstr "Nuvola non trovata"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr "Ehilà,\n\nvolevo solamente farti sapere che %s ha condiviso %s con te.\nGuarda: %s\n\nGrazie!"
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "servizi web nelle tue mani"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Modifica categorie"
@@ -561,16 +570,12 @@ msgstr "Host del database"
 msgid "Finish setup"
 msgstr "Termina la configurazione"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "servizi web nelle tue mani"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Esci"
 
@@ -604,6 +609,13 @@ msgstr "Accedi"
 msgid "Alternative Logins"
 msgstr "Accessi alternativi"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr "Ehilà,<br><br>volevo solamente farti sapere che %s ha condiviso »%s« con te.<br><a href=\"%s\">Guarda!</a><br><br>Grazie!"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "precedente"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 8dcdde980f6..9b2572674e7 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/it/files_encryption.po b/l10n/it/files_encryption.po
index d4916e8b50e..e92fab7b94b 100644
--- a/l10n/it/files_encryption.po
+++ b/l10n/it/files_encryption.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# idetao <marcxosm@gmail.com>, 2013
 # Vincenzo Reale <vinx.reale@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-31 01:58+0200\n"
-"PO-Revision-Date: 2013-05-30 04:40+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-06-16 01:58+0200\n"
+"PO-Revision-Date: 2013-06-15 11:00+0000\n"
+"Last-Translator: idetao <marcxosm@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,61 +45,118 @@ msgstr "Password modificata correttamente."
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr "Impossibile cambiare la password. Forse la vecchia password non era corretta."
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr "Password della chiave privata aggiornata correttamente."
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr "Impossibile aggiornare la password della chiave privata. Forse la vecchia password non era corretta."
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr "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."
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Salvataggio in corso..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr "La tua chiave privata non è valida! Forse è stata modifica dall'esterno."
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr "Puoi sbloccare la chiave privata nel tuo"
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr "Impostazioni personali"
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Cifratura"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr "Abilita la chiave di ripristino delle password di cifratura (consente di condividere la chiave di ripristino):"
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr "Password di ripristino dell'account"
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr "Abilitata"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr "Disabilitata"
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr "Cambia la chiave di ripristino delle password di cifratura:"
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr "Vecchia password di ripristino dell'account"
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr "Nuova password di ripristino dell'account"
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr "Modifica password"
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
-msgstr "Abilita il ripristino della password condividendo tutti i file con l'amministratore:"
-
 #: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr "La password della chiave privata non corrisponde più alla password di login:"
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr "Imposta la vecchia password della chiave privata sull'attuale password di login"
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file"
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr "Password di login vecchia"
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr "Password di login corrente"
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr "Aggiorna la Password della Chiave Privata"
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr "Abilita il recupero della password:"
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
-msgstr "L'abilitazione di questa opzione ti consentirà di ottenere nuovamente accesso ai tuoi file cifrati in caso di smarrimento della password"
+"files in case of password loss"
+msgstr "Abilitando questa opzione potrai riaccedere ai file cifrati nel caso in cui la password venga perduta"
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr "Impostazioni di ripristino dei file aggiornate"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr "Impossibile aggiornare il ripristino dei file"
diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po
index d2a159166e9..80be5945098 100644
--- a/l10n/it/files_external.po
+++ b/l10n/it/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index a7ca8ef56c0..8ba16e3fc6f 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,7 +42,3 @@ msgstr "Scarica"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Nessuna anteprima disponibile per"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "servizi web nelle tue mani"
diff --git a/l10n/it/files_trashbin.po b/l10n/it/files_trashbin.po
index 473ba531842..313cc6a7e5d 100644
--- a/l10n/it/files_trashbin.po
+++ b/l10n/it/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index b9ae9cd61d5..1f8936fb682 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Aiuto"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Personale"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Utenti"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Applicazioni"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Admin"
 
@@ -114,76 +114,76 @@ msgstr "%s non dovresti utilizzare punti nel nome del database"
 msgid "%s set the database host."
 msgstr "%s imposta l'host del database."
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nome utente e/o password di PostgreSQL non validi"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "È necessario inserire un account esistente o l'amministratore."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr "La connessione a Oracle non può essere stabilita"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "Nome utente e/o password di MySQL non validi"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Errore DB: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Il comando non consentito era: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "L'utente MySQL '%s'@'localhost' esiste già."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Elimina questo utente da MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "L'utente MySQL '%s'@'%%' esiste già"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Elimina questo utente da MySQL."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Nome utente e/o password di Oracle non validi"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Il comando non consentito era: \"%s\", nome: %s, password: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Nome utente e/o password MS SQL non validi: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Leggi attentamente le <a href='%s'>guide d'installazione</a>."
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 11a7b9a943c..f517775f9a9 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -59,7 +59,7 @@ msgstr "Email non valida"
 msgid "Unable to delete group"
 msgstr "Impossibile eliminare il gruppo"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Impossibile eliminare l'utente"
 
@@ -137,16 +137,16 @@ msgstr "annulla"
 msgid "Unable to remove user"
 msgstr "Impossibile rimuovere l'utente"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Gruppi"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Gruppi amministrati"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Elimina"
 
@@ -325,11 +325,11 @@ msgstr "Altro"
 msgid "Less"
 msgstr "Meno"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Versione"
 
-#: 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 "
@@ -339,27 +339,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è rilasciato nei termini della licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Aggiungi la tua applicazione"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Altre applicazioni"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Seleziona un'applicazione"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Vedere la pagina dell'applicazione su apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenziato da <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Aggiorna"
 
@@ -387,76 +387,76 @@ msgstr "Sistema di tracciamento bug"
 msgid "Commercial Support"
 msgstr "Supporto commerciale"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Hai utilizzato <strong>%s</strong> dei <strong>%s</strong> disponibili"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Scarica le applicazioni per sincronizzare i tuoi file"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Mostra nuovamente la procedura di primo avvio"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Hai utilizzato <strong>%s</strong> dei <strong>%s</strong> disponibili"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Password"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "La tua password è cambiata"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Modifica password non riuscita"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Password attuale"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nuova password"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Modifica password"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Nome visualizzato"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "Posta elettronica"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Il tuo indirizzo email"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Inserisci il tuo indirizzo email per abilitare il recupero della password"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Lingua"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Migliora la traduzione"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Usa questo indirizzo per connetterti al tuo ownCloud dal tuo gestore file"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Nome utente"
 
@@ -464,34 +464,40 @@ msgstr "Nome utente"
 msgid "Create"
 msgstr "Crea"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr "Password di ripristino amministrativa"
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr "Digita la password di ripristino per recuperare i file degli utenti durante la modifica della password."
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Archiviazione predefinita"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Illimitata"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Altro"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Archiviazione"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "cambia il nome visualizzato"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "imposta una nuova password"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Predefinito"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index 237899dbaa9..419b7a63713 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/it/user_webdavauth.po b/l10n/it/user_webdavauth.po
index 342564faf72..1454f5effb4 100644
--- a/l10n/it/user_webdavauth.po
+++ b/l10n/it/user_webdavauth.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# idetao <marcxosm@gmail.com>, 2013
 # Vincenzo Reale <vinx.reale@gmail.com>, 2012-2013
 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:26+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-06-16 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 08:20+0000\n"
+"Last-Translator: idetao <marcxosm@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,8 +24,8 @@ msgid "WebDAV Authentication"
 msgstr "Autenticazione WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr "URL:"
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index c77db6d7478..7f4ecc3728c 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
+# plazmism <gomidori@live.jp>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: plazmism <gomidori@live.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,27 +21,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "ユーザ %s はあなたとファイルを共有しています"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "ユーザ %s はあなたとフォルダを共有しています"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "ユーザ %s はあなたとファイル \"%s\" を共有しています。こちらからダウンロードできます: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "ユーザ %s はあなたとフォルダ \"%s\" を共有しています。こちらからダウンロードできます: %s"
+msgid "%s shared »%s« with you"
+msgstr "%sが あなたと »%s«を共有しました"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -393,7 +375,7 @@ msgstr "更新に成功しました。この問題を <a href=\"https://github.c
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "更新に成功しました。今すぐownCloudにリダイレクトします。"
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "ownCloudのパスワードをリセットします"
 
@@ -421,7 +403,19 @@ msgstr "メールでパスワードをリセットするリンクが届きます
 msgid "Username"
 msgstr "ユーザー名"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr "ファイルが暗号化されているようです。復旧キーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？"
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "はい、今すぐパスワードをリセットします。"
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "リセットを要求します。"
 
@@ -469,6 +463,21 @@ msgstr "アクセスが禁止されています"
 msgid "Cloud not found"
 msgstr "見つかりません"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr "こんにちは、\n\n%s があなたと %s を共有したことをお知らせします。\nそれを表示: %s\n\nそれでは。"
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "管理下のウェブサービス"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "カテゴリを編集"
@@ -561,16 +570,12 @@ msgstr "データベースのホスト名"
 msgid "Finish setup"
 msgstr "セットアップを完了します"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "管理下のウェブサービス"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s が利用可能です。更新方法に関してさらに情報を取得して下さい。"
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "ログアウト"
 
@@ -604,6 +609,13 @@ msgstr "ログイン"
 msgid "Alternative Logins"
 msgstr "代替ログイン"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr "こんにちは、<br><br>%sがあなたと »%s« を共有したことをお知らせします。<br><a href=\"%s\">それを表示</a><br><br>それでは。"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "前"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 91fd0f49211..f1638aacc8d 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/files_encryption.po b/l10n/ja_JP/files_encryption.po
index 218b16a00e6..9b3310cd58f 100644
--- a/l10n/ja_JP/files_encryption.po
+++ b/l10n/ja_JP/files_encryption.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
+# plazmism <gomidori@live.jp>, 2013
 # tt yn <tetuyano+transi@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-01 01:58+0200\n"
-"PO-Revision-Date: 2013-05-31 06:00+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
+"POT-Creation-Date: 2013-06-15 01:58+0200\n"
+"PO-Revision-Date: 2013-06-14 10:30+0000\n"
+"Last-Translator: plazmism <gomidori@live.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,61 +46,118 @@ msgstr "パスワードを変更できました。"
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。"
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr "秘密鍵のパスワードが正常に更新されました。"
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr "秘密鍵のパスワードを更新できませんでした。古いパスワードが正確でない場合があります。"
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr "秘密鍵が有効ではありません。パスワードが外部から変更された恐れがあります。。個人設定で秘密鍵のパスワードを更新して、ファイルへのアクセス権を奪還できます。"
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "保存中..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr "秘密鍵が有効ではありません。パスワードが外部から変更された恐れがあります。"
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr "個人設定で"
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr "秘密鍵をアンロックできます"
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "暗号化"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr "暗号化パスワードの復旧キーを有効にする(復旧キーを共有することを許可):"
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr "復旧アカウントのパスワード"
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr "有効"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr "無効"
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr "復旧キーの暗号化パスワードを変更:"
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr "古い復旧アカウントのパスワード"
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr "新しい復旧アカウントのパスワード"
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr "パスワードを変更"
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
-msgstr "管理者が全ての共有ファイルに対してパスワードによる復旧を有効にする:"
-
 #: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr "もはや秘密鍵はログインパスワードと一致しません:"
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr "古い秘密鍵のパスワードを現在のログインパスワードに設定する。"
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr "古いパスワードを覚えていない場合、管理者に尋ねてファイルを回復することができます。"
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr "古いログインパスワード"
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr "現在のログインパスワード"
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr "秘密鍵のパスワードを更新"
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr "パスワード復旧を有効化:"
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
-msgstr "このオプションを有効にすると、もしパスワードが分からなくなったとしても、暗号化されたファイルに再度アクセスすることが出来るようになります。"
+"files in case of password loss"
+msgstr "このオプションを有効にすると、パスワードを紛失した場合も、暗号化されたファイルに再度アクセスすることができるようになります。"
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr "ファイル復旧設定が更新されました"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr "ファイル復旧を更新できませんでした"
diff --git a/l10n/ja_JP/files_external.po b/l10n/ja_JP/files_external.po
index 1b206db9f8c..08607c34443 100644
--- a/l10n/ja_JP/files_external.po
+++ b/l10n/ja_JP/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index 6b9e16a32ad..35025b12090 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja_JP/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "ダウンロード"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "プレビューはありません"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "管理下のウェブサービス"
diff --git a/l10n/ja_JP/files_trashbin.po b/l10n/ja_JP/files_trashbin.po
index 9f82d0ed3b5..6016942dd4a 100644
--- a/l10n/ja_JP/files_trashbin.po
+++ b/l10n/ja_JP/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po
index 0ea154250fc..0f0586f87ce 100644
--- a/l10n/ja_JP/lib.po
+++ b/l10n/ja_JP/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "ヘルプ"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "個人"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "設定"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "ユーザ"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "アプリ"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "管理"
 
@@ -114,76 +114,76 @@ msgstr "%s ではデータベース名にドットを利用できないかもし
 msgid "%s set the database host."
 msgstr "%s にデータベースホストを設定します。"
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQLのユーザ名もしくはパスワードは有効ではありません"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "既存のアカウントもしくは管理者のどちらかを入力する必要があります。"
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr "Oracleへの接続が確立できませんでした。"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "MySQLのユーザ名もしくはパスワードは有効ではありません"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DBエラー: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "違反コマンド: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQLのユーザ '%s'@'localhost' はすでに存在します。"
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "MySQLからこのユーザを削除"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQLのユーザ '%s'@'%%' はすでに存在します。"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "MySQLからこのユーザを削除する。"
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Oracleのユーザ名もしくはパスワードは有効ではありません"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "違反コマンド: \"%s\"、名前: %s、パスワード: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL サーバーのユーザー名/パスワードが正しくありません: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "WebDAVインタフェースが動作していないと考えられるため、あなたのWEBサーバはまだファイルの同期を許可するように適切な設定がされていません。"
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "<a href='%s'>インストールガイド</a>をよく確認してください。"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 838184406e1..8765ce5b5b2 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
+# plazmism <gomidori@live.jp>, 2013
 # tt yn <tetuyano+transi@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: plazmism <gomidori@live.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,7 +61,7 @@ msgstr "無効なメールアドレス"
 msgid "Unable to delete group"
 msgstr "グループを削除できません"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "ユーザを削除できません"
 
@@ -138,16 +139,16 @@ msgstr "元に戻す"
 msgid "Unable to remove user"
 msgstr "ユーザを削除出来ません"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "グループ"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "グループ管理者"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "削除"
 
@@ -326,11 +327,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 "
@@ -340,27 +341,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud コミュニティ</a>により開発されています。 <a href=\"https://github.com/owncloud\" target=\"_blank\">ソースコード</a>は、<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ライセンスの下で提供されています。"
 
-#: 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 "apps.owncloud.com でアプリケーションのページを見てください"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-ライセンス: <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "更新"
 
@@ -388,76 +389,76 @@ msgstr "バグトラッカー"
 msgid "Commercial Support"
 msgstr "コマーシャルサポート"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "現在、<strong>%s</strong> / <strong>%s</strong> を利用しています"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "ファイルを同期するためのアプリを取得"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "初回ウィザードを再表示する"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "現在、<strong>%s</strong> / <strong>%s</strong> を利用しています"
+
+#: 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 "Current password"
 
-#: 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:81
+#: 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 "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "ファイルマネージャでownCloudに接続する際はこのアドレスを利用してください"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "ログイン名"
 
@@ -465,34 +466,40 @@ msgstr "ログイン名"
 msgid "Create"
 msgstr "作成"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr "管理者復旧パスワード"
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr "パスワード変更の間のユーザーのファイルを回復するために、リカバリパスワードを入力してください"
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "デフォルトストレージ"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "無制限"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "その他"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "ストレージ"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "表示名を変更"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "新しいパスワードを設定"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "デフォルト"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index a6c787db089..dcc68d9c631 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/user_webdavauth.po b/l10n/ja_JP/user_webdavauth.po
index 9db2784888d..a72b7381244 100644
--- a/l10n/ja_JP/user_webdavauth.po
+++ b/l10n/ja_JP/user_webdavauth.po
@@ -5,13 +5,14 @@
 # Translators:
 # Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012
 # Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012-2013
+# plazmism <gomidori@live.jp>, 2013
 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:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-16 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 05:30+0000\n"
+"Last-Translator: plazmism <gomidori@live.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,8 +25,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV 認証"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr "URL: "
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/ka/core.po b/l10n/ka/core.po
index fc467e8e09f..af6bce82f11 100644
--- a/l10n/ka/core.po
+++ b/l10n/ka/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-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-14 23:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -19,26 +19,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -216,23 +197,23 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr ""
 
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -420,7 +401,19 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr ""
 
@@ -468,6 +461,21 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr ""
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -560,16 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr ""
-
-#: templates/layout.user.php:36
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:61
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr ""
 
@@ -603,6 +607,13 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr ""
diff --git a/l10n/ka/files.po b/l10n/ka/files.po
index e4d32d74122..bc3ec2a2a2a 100644
--- a/l10n/ka/files.po
+++ b/l10n/ka/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ka/files_encryption.po b/l10n/ka/files_encryption.po
index 12883dff647..a269ba75c04 100644
--- a/l10n/ka/files_encryption.po
+++ b/l10n/ka/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ka/files_sharing.po b/l10n/ka/files_sharing.po
index 9a4106ecda2..1016eaeda81 100644
--- a/l10n/ka/files_sharing.po
+++ b/l10n/ka/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "გადმოწერა"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr ""
diff --git a/l10n/ka/settings.po b/l10n/ka/settings.po
index fe9f5ba85c5..6c4f017b65e 100644
--- a/l10n/ka/settings.po
+++ b/l10n/ka/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-05-25 02:02+0200\n"
-"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"POT-Creation-Date: 2013-06-11 01:57+0200\n"
+"PO-Revision-Date: 2013-06-10 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr ""
 
@@ -324,11 +324,11 @@ msgstr ""
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "პაროლი"
 
@@ -423,39 +423,39 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:56 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:71
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/ka/user_webdavauth.po b/l10n/ka/user_webdavauth.po
index 81c25654952..35f97470b15 100644
--- a/l10n/ka/user_webdavauth.po
+++ b/l10n/ka/user_webdavauth.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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index e97e79cebde..eb6dbd1c21f 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "მომხმარებელმა  %s გაგიზიარათ ფაილი"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "მომხმარებელმა  %s გაგიზიარათ ფოლდერი"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "მომხმარებელმა %s გაგიზიარათ ფაილი \"%s\". ის ხელმისაწვდომია გადმოსაწერად აქ: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "მომხმარებელმა %s გაგიზიარათ ფოლდერი \"%s\". ის ხელმისაწვდომია გადმოსაწერად აქ: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -392,7 +373,7 @@ msgstr "განახლება ვერ განხორციელდ�
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "ownCloud პაროლის შეცვლა"
 
@@ -420,7 +401,19 @@ msgstr "თქვენ მოგივათ პაროლის შესა
 msgid "Username"
 msgstr "მომხმარებლის სახელი"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "პაროლის შეცვლის მოთხოვნა"
 
@@ -468,6 +461,21 @@ msgstr "წვდომა აკრძალულია"
 msgid "Cloud not found"
 msgstr "ღრუბელი არ არსებობს"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "web services under your control"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "კატეგორიების რედაქტირება"
@@ -560,16 +568,12 @@ msgstr "მონაცემთა ბაზის ჰოსტი"
 msgid "Finish setup"
 msgstr "კონფიგურაციის დასრულება"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "web services under your control"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "გამოსვლა"
 
@@ -603,6 +607,13 @@ msgstr "შესვლა"
 msgid "Alternative Logins"
 msgstr "ალტერნატიული Login–ი"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "წინა"
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index 5c1aac0a3b3..a9cfcb93b6f 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/files_encryption.po b/l10n/ka_GE/files_encryption.po
index d2b48f7eeb9..bf083e8ca04 100644
--- a/l10n/ka_GE/files_encryption.po
+++ b/l10n/ka_GE/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "შენახვა..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "ენკრიპცია"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ka_GE/files_external.po b/l10n/ka_GE/files_external.po
index 27962809479..f06d1f0e89e 100644
--- a/l10n/ka_GE/files_external.po
+++ b/l10n/ka_GE/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/files_sharing.po b/l10n/ka_GE/files_sharing.po
index 2e68b29c28c..5598b06b22f 100644
--- a/l10n/ka_GE/files_sharing.po
+++ b/l10n/ka_GE/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,7 +42,3 @@ msgstr "ჩამოტვირთვა"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "წინასწარი დათვალიერება შეუძლებელია"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "web services under your control"
diff --git a/l10n/ka_GE/files_trashbin.po b/l10n/ka_GE/files_trashbin.po
index 83088eb7f50..09661d5d66b 100644
--- a/l10n/ka_GE/files_trashbin.po
+++ b/l10n/ka_GE/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po
index 6990feb95e8..2df50c389e2 100644
--- a/l10n/ka_GE/lib.po
+++ b/l10n/ka_GE/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "დახმარება"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "პირადი"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "პარამეტრები"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "მომხმარებელი"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "აპლიკაციები"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "ადმინისტრატორი"
 
@@ -113,76 +113,76 @@ msgstr "%s არ მიუთითოთ წერტილი ბაზის
 msgid "%s set the database host."
 msgstr "%s მიუთითეთ ბაზის ჰოსტი."
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL იუზერნეიმი და/ან პაროლი არ არის სწორი"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "თქვენ უნდა შეიყვანოთ არსებული მომხმარებელის სახელი ან ადმინისტრატორი."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL იუზერნეიმი და/ან პაროლი არ არის სწორი"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB შეცდომა: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Offending ბრძანება იყო: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL მომხმარებელი '%s'@'localhost' უკვე არსებობს."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "წაშალე ეს მომხამრებელი MySQL–იდან"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL მომხმარებელი '%s'@'%%' უკვე არსებობს"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "წაშალე ეს მომხამრებელი MySQL–იდან"
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle იუზერნეიმი და/ან პაროლი არ არის სწორი"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Offending ბრძანება იყო: \"%s\", სახელი: %s, პაროლი: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL მომხმარებელი და/ან პაროლი არ არის მართებული: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "თქვენი web სერვერი არ არის კონფიგურირებული ფაილ სინქრონიზაციისთვის, რადგან WebDAV ინტერფეისი შეიძლება იყოს გატეხილი."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "გთხოვთ გადაათვალიეროთ <a href='%s'>ინსტალაციის გზამკვლევი</a>."
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index f7aad03ea81..b6f77832c5d 100644
--- a/l10n/ka_GE/settings.po
+++ b/l10n/ka_GE/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -59,7 +59,7 @@ msgstr "არასწორი იმეილი"
 msgid "Unable to delete group"
 msgstr "ჯგუფის წაშლა ვერ მოხერხდა"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "მომხმარებლის წაშლა ვერ მოხერხდა"
 
@@ -137,16 +137,16 @@ msgstr "დაბრუნება"
 msgid "Unable to remove user"
 msgstr "მომხმარებლის წაშლა ვერ მოხერხდა"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "ჯგუფები"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "ჯგუფის ადმინისტრატორი"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "წაშლა"
 
@@ -325,11 +325,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 "
@@ -339,27 +339,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "წარმოებულია <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>–ის მიერ. <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a>  ვრცელდება <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ლიცენზიის ფარგლებში."
 
-#: 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 "ნახეთ აპლიკაციის გვერდი apps.owncloud.com –ზე"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-ლიცენსირებულია <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "განახლება"
 
@@ -387,76 +387,76 @@ msgstr "ბაგთრექერი"
 msgid "Commercial Support"
 msgstr "კომერციული მხარდაჭერა"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "თქვენ გამოყენებული გაქვთ <strong>%s</strong> –ი –<strong>%s<strong>–დან"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "აპლიკაცია ფაილების სინქრონიზაციისთვის"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "მაჩვენე თავიდან გაშვებული ვიზარდი"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "თქვენ გამოყენებული გაქვთ <strong>%s</strong> –ი –<strong>%s<strong>–დან"
+
+#: 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:81
+#: 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 "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "გამოიყენე შემდეგი მისამართი ownCloud–თან დასაკავშირებლად შენს ფაილმენეჯერში"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "მომხმარებლის სახელი"
 
@@ -464,34 +464,40 @@ msgstr "მომხმარებლის სახელი"
 msgid "Create"
 msgstr "შექმნა"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "საწყისი საცავი"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "ულიმიტო"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "სხვა"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "საცავი"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "შეცვალე დისფლეის სახელი"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "დააყენეთ ახალი პაროლი"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "საწყისი პარამეტრები"
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index bf6a3661596..aa2444a6c90 100644
--- a/l10n/ka_GE/user_ldap.po
+++ b/l10n/ka_GE/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ka_GE/user_webdavauth.po b/l10n/ka_GE/user_webdavauth.po
index 275948740f4..88af8f6bf41 100644
--- a/l10n/ka_GE/user_webdavauth.po
+++ b/l10n/ka_GE/user_webdavauth.po
@@ -8,8 +8,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV აუთენთიფიკაცია"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/kn/core.po b/l10n/kn/core.po
index d5e7454d04e..feab760f672 100644
--- a/l10n/kn/core.po
+++ b/l10n/kn/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-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-14 23:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -19,26 +19,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -216,23 +197,23 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr ""
 
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -420,7 +401,19 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr ""
 
@@ -468,6 +461,21 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr ""
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -560,16 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr ""
-
-#: templates/layout.user.php:36
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:61
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr ""
 
@@ -603,6 +607,13 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr ""
diff --git a/l10n/kn/files_encryption.po b/l10n/kn/files_encryption.po
index dda2e54fa16..260b2a5a715 100644
--- a/l10n/kn/files_encryption.po
+++ b/l10n/kn/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/kn/files_sharing.po b/l10n/kn/files_sharing.po
index a2eded06e4e..f0d51d40c7e 100644
--- a/l10n/kn/files_sharing.po
+++ b/l10n/kn/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-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:47+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr ""
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr ""
diff --git a/l10n/kn/settings.po b/l10n/kn/settings.po
index 899150546d3..435aa50322b 100644
--- a/l10n/kn/settings.po
+++ b/l10n/kn/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-05-25 02:02+0200\n"
-"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"POT-Creation-Date: 2013-06-11 01:57+0200\n"
+"PO-Revision-Date: 2013-06-10 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr ""
 
@@ -324,11 +324,11 @@ msgstr ""
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr ""
 
@@ -423,39 +423,39 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:56 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:71
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/kn/user_webdavauth.po b/l10n/kn/user_webdavauth.po
index 771cd4f87ee..535cabb87b6 100644
--- a/l10n/kn/user_webdavauth.po
+++ b/l10n/kn/user_webdavauth.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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 0c2789171c7..728a9b984f3 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -20,27 +20,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "%s 님이 파일을 공유하였습니다"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "%s 님이 폴더를 공유하였습니다"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "%s 님이 파일 \"%s\"을(를) 공유하였습니다. 여기에서 다운로드할 수 있습니다: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "%s 님이 폴더 \"%s\"을(를) 공유하였습니다. 여기에서 다운로드할 수 있습니다: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -393,7 +374,7 @@ msgstr "업데이트가 실패하였습니다. 이 문제를 <a href=\"https://g
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "업데이트가 성공하였습니다. ownCloud로 돌아갑니다."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "ownCloud 암호 재설정"
 
@@ -421,7 +402,19 @@ msgstr "이메일로 암호 재설정 링크를 보냈습니다."
 msgid "Username"
 msgstr "사용자 이름"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "요청 초기화"
 
@@ -469,6 +462,21 @@ msgstr "접근 금지됨"
 msgid "Cloud not found"
 msgstr "클라우드를 찾을 수 없습니다"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "내가 관리하는 웹 서비스"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "분류 수정"
@@ -561,16 +569,12 @@ msgstr "데이터베이스 호스트"
 msgid "Finish setup"
 msgstr "설치 완료"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "내가 관리하는 웹 서비스"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "로그아웃"
 
@@ -604,6 +608,13 @@ msgstr "로그인"
 msgid "Alternative Logins"
 msgstr "대체 "
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "이전"
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 7e9b18c3c9d..d8fdcd466dd 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ko/files_encryption.po b/l10n/ko/files_encryption.po
index 4a5fd3c1fc2..1b93cac0578 100644
--- a/l10n/ko/files_encryption.po
+++ b/l10n/ko/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "저장 중..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "암호화"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ko/files_external.po b/l10n/ko/files_external.po
index b1a27686b36..2aacc5c0757 100644
--- a/l10n/ko/files_external.po
+++ b/l10n/ko/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index 689547694ec..4a063859e14 100644
--- a/l10n/ko/files_sharing.po
+++ b/l10n/ko/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "다운로드"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "다음 항목을 미리 볼 수 없음:"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "내가 관리하는 웹 서비스"
diff --git a/l10n/ko/files_trashbin.po b/l10n/ko/files_trashbin.po
index df92a1b7273..4faf9aa8418 100644
--- a/l10n/ko/files_trashbin.po
+++ b/l10n/ko/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index b1a6d13081f..1f90b67d281 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "도움말"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "개인"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "설정"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "사용자"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "앱"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "관리자"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index f77d977fcd2..17b777832bf 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\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 "사용자를 삭제할 수 없습니다."
 
@@ -136,16 +136,16 @@ msgstr "되돌리기"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "그룹"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "그룹 관리자"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 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 "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 커뮤니티</a>에 의해서 개발되었습니다. <a href=\"https://github.com/owncloud\" target=\"_blank\">원본 코드</a>는 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>에 따라 사용이 허가됩니다."
 
-#: 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 "apps.owncloud.com에 있는 앱 페이지를 참고하십시오"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-라이선스됨: <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "업데이트"
 
@@ -386,76 +386,76 @@ msgstr "버그 트래커"
 msgid "Commercial Support"
 msgstr "상업용 지원"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "현재 공간 <strong>%s</strong>/<strong>%s</strong>을(를) 사용 중입니다"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "앱을 이용하여 당신의 파일을 동기화 할 수 있습니다."
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "첫 실행 마법사 다시 보이기"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "현재 공간 <strong>%s</strong>/<strong>%s</strong>을(를) 사용 중입니다"
+
+#: 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:81
+#: 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 "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "파일 관리자에서 ownCloud에 접속하려면 이 주소를 사용하십시오."
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "로그인 이름"
 
@@ -463,34 +463,40 @@ msgstr "로그인 이름"
 msgid "Create"
 msgstr "만들기"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "기본 저장소"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "무제한"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "기타"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "저장소"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "표시 이름 변경"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "새 암호 설정"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "기본값"
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index a2ccc231e99..cb6b5866339 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ko/user_webdavauth.po b/l10n/ko/user_webdavauth.po
index 07e03e88385..73deb90e44b 100644
--- a/l10n/ko/user_webdavauth.po
+++ b/l10n/ko/user_webdavauth.po
@@ -13,8 +13,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -28,8 +28,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV 인증"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index 4e77de5d81f..a2391141367 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -19,26 +19,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -420,7 +401,19 @@ msgstr ""
 msgid "Username"
 msgstr "ناوی به‌کارهێنه‌ر"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr ""
 
@@ -468,6 +461,21 @@ msgstr ""
 msgid "Cloud not found"
 msgstr "هیچ نه‌دۆزرایه‌وه‌"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -560,16 +568,12 @@ msgstr "هۆستی داتابه‌یس"
 msgid "Finish setup"
 msgstr "كۆتایی هات ده‌ستكاریه‌كان"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "چوونەدەرەوە"
 
@@ -603,6 +607,13 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "پێشتر"
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index e50657299d4..d97e457f4ca 100644
--- a/l10n/ku_IQ/files.po
+++ b/l10n/ku_IQ/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/files_encryption.po b/l10n/ku_IQ/files_encryption.po
index c8090c00e44..79e9763bf0f 100644
--- a/l10n/ku_IQ/files_encryption.po
+++ b/l10n/ku_IQ/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "پاشکه‌وتده‌کات..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "نهێنیکردن"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ku_IQ/files_sharing.po b/l10n/ku_IQ/files_sharing.po
index 7125a2c5752..99d1f23f038 100644
--- a/l10n/ku_IQ/files_sharing.po
+++ b/l10n/ku_IQ/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "داگرتن"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "هیچ پێشبینیه‌ك ئاماده‌ نیه بۆ"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه"
diff --git a/l10n/ku_IQ/files_trashbin.po b/l10n/ku_IQ/files_trashbin.po
index 42f52717b63..ceb41f40b93 100644
--- a/l10n/ku_IQ/files_trashbin.po
+++ b/l10n/ku_IQ/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/lib.po b/l10n/ku_IQ/lib.po
index ee1a6b9a111..085812d610d 100644
--- a/l10n/ku_IQ/lib.po
+++ b/l10n/ku_IQ/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 00:02+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "یارمەتی"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr ""
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "ده‌ستكاری"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "به‌كارهێنه‌ر"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "به‌رنامه‌كان"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "به‌ڕێوه‌به‌ری سه‌ره‌كی"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index a70601ea517..8e606d67659 100644
--- a/l10n/ku_IQ/settings.po
+++ b/l10n/ku_IQ/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\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 ""
 
@@ -136,16 +136,16 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 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
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: 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:81
+#: 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:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index ccd0d27583a..ac98cb7219e 100644
--- a/l10n/ku_IQ/user_ldap.po
+++ b/l10n/ku_IQ/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/user_webdavauth.po b/l10n/ku_IQ/user_webdavauth.po
index 381e788ea49..14906a0a573 100644
--- a/l10n/ku_IQ/user_webdavauth.po
+++ b/l10n/ku_IQ/user_webdavauth.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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 1d2b758381c..59e4d326187 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -19,26 +19,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "ownCloud Passwuert reset"
 
@@ -420,7 +401,19 @@ msgstr "Du kriss en Link fir däin Passwuert nei ze setzen via Email geschéckt.
 msgid "Username"
 msgstr "Benotzernumm"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Reset ufroen"
 
@@ -468,6 +461,21 @@ msgstr "Access net erlaabt"
 msgid "Cloud not found"
 msgstr "Cloud net fonnt"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "Web Servicer ënnert denger Kontroll"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Kategorien editéieren"
@@ -560,16 +568,12 @@ msgstr "Datebank Server"
 msgid "Finish setup"
 msgstr "Installatioun ofschléissen"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "Web Servicer ënnert denger Kontroll"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Ausloggen"
 
@@ -603,6 +607,13 @@ msgstr "Log dech an"
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "zeréck"
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index 71d0b5c5f66..a2cff0aab0b 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lb/files_encryption.po b/l10n/lb/files_encryption.po
index 304094fcb33..ab40dca41a4 100644
--- a/l10n/lb/files_encryption.po
+++ b/l10n/lb/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Speicheren..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/lb/files_external.po b/l10n/lb/files_external.po
index b271b1b1536..9bdd1dba467 100644
--- a/l10n/lb/files_external.po
+++ b/l10n/lb/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index 383d33fe445..48dd1399544 100644
--- a/l10n/lb/files_sharing.po
+++ b/l10n/lb/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Download"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "Web Servicer ënnert denger Kontroll"
diff --git a/l10n/lb/files_trashbin.po b/l10n/lb/files_trashbin.po
index 04b3b0aee78..565b230a456 100644
--- a/l10n/lb/files_trashbin.po
+++ b/l10n/lb/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po
index b35aa00cdaa..9a7f5d205ad 100644
--- a/l10n/lb/lib.po
+++ b/l10n/lb/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Hëllef"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Perséinlech"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Astellungen"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Benotzer"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Applicatiounen"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Admin"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index ee89997b7f1..5daa7db884c 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr "Ongülteg e-mail"
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr ""
 
@@ -136,16 +136,16 @@ msgstr "réckgängeg man"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Gruppen"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Gruppen Admin"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Läschen"
 
@@ -324,11 +324,11 @@ msgstr "Méi"
 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 "Setz deng App bei"
 
-#: 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 "Wiel eng Applikatioun aus"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Kuck dir d'Applicatioun's Säit op apps.owncloud.com un"
 
-#: 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
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Passwuert"
 
-#: 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 "Konnt däin Passwuert net änneren"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Momentan 't Passwuert"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Neit Passwuert"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Passwuert änneren"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Deng Email Adress"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Gëff eng Email Adress an fir d'Passwuert recovery ze erlaben"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Sprooch"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Hëllef iwwersetzen"
 
-#: 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:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr "Erstellen"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Aner"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index b4f2857a1e1..1cf5b951b04 100644
--- a/l10n/lb/user_ldap.po
+++ b/l10n/lb/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lb/user_webdavauth.po b/l10n/lb/user_webdavauth.po
index 1bceab60dbf..20d27db5b44 100644
--- a/l10n/lb/user_webdavauth.po
+++ b/l10n/lb/user_webdavauth.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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 4d099f364dc..f2ee33bb5ae 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
-"Last-Translator: fizikiukas <fizikiukas@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,27 +21,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "Vartotojas %s pasidalino su jumis failu"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "Vartotojas %s su jumis pasidalino aplanku"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "Vartotojas %s pasidalino failu \"%s\" su jumis. Jį atsisiųsti galite čia: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "Vartotojas %s pasidalino aplanku \"%s\" su jumis. Jį atsisiųsti galite čia: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -394,7 +375,7 @@ msgstr "Atnaujinimas buvo nesėkmingas. PApie tai prašome pranešti the <a href
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "ownCloud slaptažodžio atkūrimas"
 
@@ -422,7 +403,19 @@ msgstr "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nusta
 msgid "Username"
 msgstr "Prisijungimo vardas"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Prašyti nustatymo iš najo"
 
@@ -470,6 +463,21 @@ msgstr "Priėjimas draudžiamas"
 msgid "Cloud not found"
 msgstr "Negalima rasti"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "jūsų valdomos web paslaugos"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Redaguoti kategorijas"
@@ -562,16 +570,12 @@ msgstr "Duomenų bazės serveris"
 msgid "Finish setup"
 msgstr "Baigti diegimą"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "jūsų valdomos web paslaugos"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s yra prieinama. Gaukite daugiau informacijos apie atnaujinimą."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Atsijungti"
 
@@ -605,6 +609,13 @@ msgstr "Prisijungti"
 msgid "Alternative Logins"
 msgstr "Alternatyvūs prisijungimai"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "atgal"
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 93d831d4dab..b9e6931e89b 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: fizikiukas <fizikiukas@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/files_encryption.po b/l10n/lt_LT/files_encryption.po
index 95c521c9553..fa7a51d9326 100644
--- a/l10n/lt_LT/files_encryption.po
+++ b/l10n/lt_LT/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-08 02:03+0200\n"
-"PO-Revision-Date: 2013-06-07 09:23+0000\n"
-"Last-Translator: fizikiukas <fizikiukas@gmail.com>\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,61 +44,118 @@ msgstr "Slaptažodis sėkmingai pakeistas"
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr "Slaptažodis nebuvo pakeistas. Gali būti, kad buvo neteisingai suvestas senasis."
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Saugoma..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Šifravimas"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr "Įjungti šifravimo slaptažodžio atstatymo raktą (leidžia dalintis su atstatymo raktu):"
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr "Atstatymo vartotojo slaptažodis"
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr "Įjungta"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr "Išjungta"
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr "Pakeisti šifravimo slaptažodžio atstatymo raktą:"
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr "Seno atstatymo vartotojo slaptažodis"
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr "naujo atstatymo vartotojo slaptažodis"
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr "Pakeisti slaptažodį"
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
-msgstr "Įjungti slaptažodžio atkūrimą dalinantis visais failas su administratoriumi:"
-
 #: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
-msgstr "Įjungus šią funkciją jums bus suteiktas priėjimas prie šifruotos informacijos ir pamiršus slaptažodį."
+"files in case of password loss"
+msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr "Failų atstatymo nustatymai pakeisti"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr "Neišėjo atnaujinti failų atkūrimo"
diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po
index 6be0edc012b..7ba9d3aa5ee 100644
--- a/l10n/lt_LT/files_external.po
+++ b/l10n/lt_LT/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: Min2liz <min2lizz@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index ea4ed5e423c..750e1c3a202 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: fizikiukas <fizikiukas@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +43,3 @@ msgstr "Atsisiųsti"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Peržiūra nėra galima"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "jūsų valdomos web paslaugos"
diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po
index d3c2715743e..3c889214ff0 100644
--- a/l10n/lt_LT/files_trashbin.po
+++ b/l10n/lt_LT/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: fizikiukas <fizikiukas@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index bba563de039..09b052eaa5a 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: fizikiukas <fizikiukas@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Pagalba"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Asmeniniai"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Vartotojai"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Programos"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Administravimas"
 
@@ -114,76 +114,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index ef026ee43c3..f1673c058b2 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr "Netinkamas el. paštas"
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr ""
 
@@ -136,16 +136,16 @@ msgstr "anuliuoti"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Grupės"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Ištrinti"
 
@@ -324,11 +324,11 @@ msgstr "Daugiau"
 msgid "Less"
 msgstr "Mažiau"
 
-#: 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 "Pridėti programėlę"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Daugiau aplikacijų"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Pasirinkite programą"
 
-#: 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 "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Atnaujinti"
 
@@ -386,76 +386,76 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Atsisiųskite programėlių, kad sinchronizuotumėte savo failus"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Jūsų slaptažodis buvo pakeistas"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Neįmanoma pakeisti slaptažodžio"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Dabartinis slaptažodis"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Naujas slaptažodis"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Pakeisti slaptažodį"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "El. Paštas"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Jūsų el. pašto adresas"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Pamiršto slaptažodžio atkūrimui įveskite savo el. pašto adresą"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Kalba"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Padėkite išversti"
 
-#: 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:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr "Sukurti"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Kita"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index c10fa0a0a80..3378a86e425 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/user_webdavauth.po b/l10n/lt_LT/user_webdavauth.po
index 173f9167f2b..401e8edc0f3 100644
--- a/l10n/lt_LT/user_webdavauth.po
+++ b/l10n/lt_LT/user_webdavauth.po
@@ -8,8 +8,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV autorizavimas"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "Adresas: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 4ae8f28b9fe..c1833862927 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "Lietotājs %s ar jums dalījās ar datni."
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "Lietotājs %s ar jums dalījās ar mapi."
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "Lietotājs %s ar jums dalījās ar datni “%s”. To var lejupielādēt šeit — %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "Lietotājs %s ar jums dalījās ar mapi “%s”. To var lejupielādēt šeit — %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -392,7 +373,7 @@ msgstr "Atjaunināšana beidzās nesekmīgi. Lūdzu, ziņojiet par šo problēmu
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "ownCloud paroles maiņa"
 
@@ -420,7 +401,19 @@ msgstr "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjau
 msgid "Username"
 msgstr "Lietotājvārds"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Pieprasīt paroles maiņu"
 
@@ -468,6 +461,21 @@ msgstr "Pieeja ir liegta"
 msgid "Cloud not found"
 msgstr "Mākonis netika atrasts"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "tīmekļa servisi tavā varā"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Rediģēt kategoriju"
@@ -560,16 +568,12 @@ msgstr "Datubāzes serveris"
 msgid "Finish setup"
 msgstr "Pabeigt iestatīšanu"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "tīmekļa servisi tavā varā"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Izrakstīties"
 
@@ -603,6 +607,13 @@ msgstr "Ierakstīties"
 msgid "Alternative Logins"
 msgstr "Alternatīvās pieteikšanās"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "iepriekšējā"
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index cb43c60d534..f825401fbf3 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lv/files_encryption.po b/l10n/lv/files_encryption.po
index 4d1d0d415bd..aed651ab905 100644
--- a/l10n/lv/files_encryption.po
+++ b/l10n/lv/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Saglabā..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Šifrēšana"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/lv/files_external.po b/l10n/lv/files_external.po
index 2633445b056..7c43d6fb6f8 100644
--- a/l10n/lv/files_external.po
+++ b/l10n/lv/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index 363c509eee3..c7ac8d9041e 100644
--- a/l10n/lv/files_sharing.po
+++ b/l10n/lv/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Lejupielādēt"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Nav pieejams priekšskatījums priekš"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "tīmekļa servisi tavā varā"
diff --git a/l10n/lv/files_trashbin.po b/l10n/lv/files_trashbin.po
index 18ebc2211d7..b14559f1d7f 100644
--- a/l10n/lv/files_trashbin.po
+++ b/l10n/lv/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po
index 786ee3a999f..ddf45cfa264 100644
--- a/l10n/lv/lib.po
+++ b/l10n/lv/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Palīdzība"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Personīgi"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Iestatījumi"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Lietotāji"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Lietotnes"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Administratori"
 
@@ -113,76 +113,76 @@ msgstr "%s datubāžu nosaukumos nedrīkst izmantot punktus"
 msgid "%s set the database host."
 msgstr "%s iestatiet datubāžu serveri."
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nav derīga PostgreSQL parole un/vai lietotājvārds"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Jums jāievada vai nu esošs vai administratora konts."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "Nav derīga MySQL parole un/vai lietotājvārds"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB kļūda — “%s”"
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Vainīgā komanda bija “%s”"
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL lietotājs %s'@'localhost' jau eksistē."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Izmest šo lietotāju no MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL lietotājs '%s'@'%%' jau eksistē"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Izmest šo lietotāju no MySQL."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Nav derīga Oracle parole un/vai lietotājvārds"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Vainīgā komanda bija \"%s\", vārds: %s, parole: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Nav derīga MySQL parole un/vai lietotājvārds — %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datnes, jo izskatās, ka WebDAV saskarne ir salauzta."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Lūdzu, vēlreiz pārbaudiet <a href='%s'>instalēšanas palīdzību</a>."
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index c03dbefd32b..63d7c64c800 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr "Nederīgs epasts"
 msgid "Unable to delete group"
 msgstr "Nevar izdzēst grupu"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Nevar izdzēst lietotāju"
 
@@ -136,16 +136,16 @@ msgstr "atsaukt"
 msgid "Unable to remove user"
 msgstr "Nevar izņemt lietotāju"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Grupas"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Grupas administrators"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Dzēst"
 
@@ -324,11 +324,11 @@ msgstr "Vairāk"
 msgid "Less"
 msgstr "Mazāk"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Versija"
 
-#: 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 "Izstrādājusi<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kopiena</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">pirmkodu</a>kurš ir licencēts zem <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Pievieno savu lietotni"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Vairāk lietotņu"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Izvēlies lietotni"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Apskati lietotņu lapu — apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licencēts no <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Atjaunināt"
 
@@ -386,76 +386,76 @@ msgstr "Kļūdu sekotājs"
 msgid "Commercial Support"
 msgstr "Komerciālais atbalsts"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Jūs lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Saņem lietotnes, lai sinhronizētu savas datnes"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Vēlreiz rādīt pirmās palaišanas vedni"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Jūs lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Parole"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Jūru parole tika nomainīta"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Nevar nomainīt jūsu paroli"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Pašreizējā parole"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Jauna parole"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Mainīt paroli"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Redzamais vārds"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "E-pasts"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Jūsu e-pasta adrese"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Ievadiet e-pasta adresi, lai vēlāk varētu atgūt paroli, ja būs nepieciešamība"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Valoda"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Palīdzi tulkot"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Izmanto šo adresi, lai, izmantojot datņu pārvaldnieku, savienotos ar savu ownCloud"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Ierakstīšanās vārds"
 
@@ -463,34 +463,40 @@ msgstr "Ierakstīšanās vārds"
 msgid "Create"
 msgstr "Izveidot"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Noklusējuma krātuve"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Neierobežota"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Cits"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Krātuve"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "mainīt redzamo vārdu"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "iestatīt jaunu paroli"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Noklusējuma"
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index ffca50ac339..3a056a1cae8 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lv/user_webdavauth.po b/l10n/lv/user_webdavauth.po
index bc468773100..cdc12e2a8ce 100644
--- a/l10n/lv/user_webdavauth.po
+++ b/l10n/lv/user_webdavauth.po
@@ -8,8 +8,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV autentifikācija"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 0f4afc9a659..f9e9d476cd3 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "Корисникот %s сподели датотека со Вас"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "Корисникот %s сподели папка со Вас"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "Корисникот %s ја сподели датотека „%s“ со Вас. Достапна е за преземање тука: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "Корисникот %s ја сподели папката „%s“ со Вас. Достапна е за преземање тука: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "ресетирање на лозинка за ownCloud"
 
@@ -420,7 +401,19 @@ msgstr "Ќе добиете врска по е-пошта за да може д�
 msgid "Username"
 msgstr "Корисничко име"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Побарајте ресетирање"
 
@@ -468,6 +461,21 @@ msgstr "Забранет пристап"
 msgid "Cloud not found"
 msgstr "Облакот не е најден"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "веб сервиси под Ваша контрола"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Уреди категории"
@@ -560,16 +568,12 @@ msgstr "Сервер со база"
 msgid "Finish setup"
 msgstr "Заврши го подесувањето"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "веб сервиси под Ваша контрола"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Одјава"
 
@@ -603,6 +607,13 @@ msgstr "Најава"
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "претходно"
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index e09a4d413cb..5b599c474fe 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/mk/files_encryption.po b/l10n/mk/files_encryption.po
index 5ccdc506c2c..567f8e4727f 100644
--- a/l10n/mk/files_encryption.po
+++ b/l10n/mk/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Снимам..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Енкрипција"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po
index 9f5c977fb5d..03eb11a89a9 100644
--- a/l10n/mk/files_external.po
+++ b/l10n/mk/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index 9add39736bb..0ff2f6e80b5 100644
--- a/l10n/mk/files_sharing.po
+++ b/l10n/mk/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Преземи"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Нема достапно преглед за"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "веб сервиси под Ваша контрола"
diff --git a/l10n/mk/files_trashbin.po b/l10n/mk/files_trashbin.po
index 74723ed7f1e..bb79cbd00f3 100644
--- a/l10n/mk/files_trashbin.po
+++ b/l10n/mk/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index f8ca0c7c0ef..c9f4a525400 100644
--- a/l10n/mk/lib.po
+++ b/l10n/mk/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Помош"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Лично"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Подесувања"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Корисници"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Аппликации"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Админ"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 447a29db0af..104532e440f 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\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 "Неможам да избришам корисник"
 
@@ -136,16 +136,16 @@ msgstr "врати"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Групи"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Администратор на група"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 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 "Развој од <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud заедницата</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворниот код</a> е лиценциран со<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: 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 "Види ја страницата со апликации на apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-лиценцирано од <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Ажурирај"
 
@@ -386,76 +386,76 @@ msgstr ""
 msgid "Commercial Support"
 msgstr "Комерцијална подршка"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Имате искористено <strong>%s</strong> од достапните <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Имате искористено <strong>%s</strong> од достапните <strong>%s</strong>"
+
+#: 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:81
+#: 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 "WebDAV"
 
-#: 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:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr "Создај"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Останато"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index 0517541d713..ff3d3ab4a14 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/mk/user_webdavauth.po b/l10n/mk/user_webdavauth.po
index 78f50a5abe4..4f39ddca61f 100644
--- a/l10n/mk/user_webdavauth.po
+++ b/l10n/mk/user_webdavauth.po
@@ -8,8 +8,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 694c52efd95..39edfdbaecc 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -19,26 +19,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "Set semula kata lalaun ownCloud"
 
@@ -420,7 +401,19 @@ msgstr "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melal
 msgid "Username"
 msgstr "Nama pengguna"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Permintaan set semula"
 
@@ -468,6 +461,21 @@ msgstr "Larangan akses"
 msgid "Cloud not found"
 msgstr "Awan tidak dijumpai"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "Perkhidmatan web di bawah kawalan anda"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Ubah kategori"
@@ -560,16 +568,12 @@ msgstr "Hos pangkalan data"
 msgid "Finish setup"
 msgstr "Setup selesai"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "Perkhidmatan web di bawah kawalan anda"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Log keluar"
 
@@ -603,6 +607,13 @@ msgstr "Log masuk"
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "sebelum"
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index 0d8a27fcadb..32344a23133 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/files_encryption.po b/l10n/ms_MY/files_encryption.po
index bbbe2f3aa5a..19d498e835a 100644
--- a/l10n/ms_MY/files_encryption.po
+++ b/l10n/ms_MY/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Simpan..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ms_MY/files_external.po b/l10n/ms_MY/files_external.po
index b030d2708db..e37c2127aba 100644
--- a/l10n/ms_MY/files_external.po
+++ b/l10n/ms_MY/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
index 810495c5502..6f1ae5bbf11 100644
--- a/l10n/ms_MY/files_sharing.po
+++ b/l10n/ms_MY/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Muat turun"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "Perkhidmatan web di bawah kawalan anda"
diff --git a/l10n/ms_MY/files_trashbin.po b/l10n/ms_MY/files_trashbin.po
index 692260ced50..afcfdaf4916 100644
--- a/l10n/ms_MY/files_trashbin.po
+++ b/l10n/ms_MY/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/lib.po b/l10n/ms_MY/lib.po
index e9bf60a848c..2a565960a30 100644
--- a/l10n/ms_MY/lib.po
+++ b/l10n/ms_MY/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Bantuan"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Peribadi"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Tetapan"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Pengguna"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Aplikasi"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Admin"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index feca0679a94..a3a5b1f3b54 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr "Emel tidak sah"
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr ""
 
@@ -136,16 +136,16 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Kumpulan"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Padam"
 
@@ -324,11 +324,11 @@ msgstr "Lanjutan"
 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 "Tambah apps anda"
 
-#: 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 "Pilih aplikasi"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Lihat halaman applikasi di apps.owncloud.com"
 
-#: 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 "Kemaskini"
 
@@ -386,76 +386,76 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Kata laluan"
 
-#: 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 "Gagal mengubah kata laluan anda "
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Kata laluan semasa"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Kata laluan baru"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Ubah kata laluan"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Alamat emel anda"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Isi alamat emel anda untuk membolehkan pemulihan kata laluan"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Bahasa"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Bantu terjemah"
 
-#: 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:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr "Buat"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Lain"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index 5d2e9b78ce1..4cf1253323e 100644
--- a/l10n/ms_MY/user_ldap.po
+++ b/l10n/ms_MY/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/user_webdavauth.po b/l10n/ms_MY/user_webdavauth.po
index acf08a184c1..57b4d246ca0 100644
--- a/l10n/ms_MY/user_webdavauth.po
+++ b/l10n/ms_MY/user_webdavauth.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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
index b6d57436146..5519e10dbc2 100644
--- a/l10n/my_MM/core.po
+++ b/l10n/my_MM/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -19,26 +19,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -420,7 +401,19 @@ msgstr "အီးမေးလ်မှတစ်ဆင့် သင်၏စက�
 msgid "Username"
 msgstr "သုံးစွဲသူအမည်"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr ""
 
@@ -468,6 +461,21 @@ msgstr ""
 msgid "Cloud not found"
 msgstr "မတွေ့ရှိမိပါ"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -560,16 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr "တပ်ဆင်ခြင်းပြီးပါပြီ။"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr ""
 
@@ -603,6 +607,13 @@ msgstr "ဝင်ရောက်ရန်"
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "ယခင်"
diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po
index 3d6c988d93c..7ef2423ca5b 100644
--- a/l10n/my_MM/files.po
+++ b/l10n/my_MM/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/files_encryption.po b/l10n/my_MM/files_encryption.po
index 876bedaf914..5c24e30b340 100644
--- a/l10n/my_MM/files_encryption.po
+++ b/l10n/my_MM/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po
index 9c3ee30fdfb..b32b0ce216e 100644
--- a/l10n/my_MM/files_sharing.po
+++ b/l10n/my_MM/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "ဒေါင်းလုတ်"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services"
diff --git a/l10n/my_MM/lib.po b/l10n/my_MM/lib.po
index cd297e9eec1..9af080dfd09 100644
--- a/l10n/my_MM/lib.po
+++ b/l10n/my_MM/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: my_MM\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "အကူအညီ"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr ""
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr ""
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "သုံးစွဲသူ"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "အက်ဒမင်"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po
index d80dc9bfb15..6053a208e82 100644
--- a/l10n/my_MM/settings.po
+++ b/l10n/my_MM/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-05-25 02:02+0200\n"
-"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"POT-Creation-Date: 2013-06-11 01:57+0200\n"
+"PO-Revision-Date: 2013-06-10 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr ""
 
@@ -324,11 +324,11 @@ msgstr ""
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "စကားဝှက်"
 
@@ -423,39 +423,39 @@ msgstr "စကားဝှက်အသစ်"
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:56 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:71
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/my_MM/user_webdavauth.po b/l10n/my_MM/user_webdavauth.po
index 51443b323f3..f89dd9cd9e7 100644
--- a/l10n/my_MM/user_webdavauth.po
+++ b/l10n/my_MM/user_webdavauth.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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 4252c159b96..5152e81c5c9 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -19,26 +19,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "Tilbakestill ownCloud passord"
 
@@ -420,7 +401,19 @@ msgstr "Du burde motta detaljer om å tilbakestille passordet ditt via epost."
 msgid "Username"
 msgstr "Brukernavn"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Anmod tilbakestilling"
 
@@ -468,6 +461,21 @@ msgstr "Tilgang nektet"
 msgid "Cloud not found"
 msgstr "Sky ikke funnet"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "web tjenester du kontrollerer"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Rediger kategorier"
@@ -560,16 +568,12 @@ msgstr "Databasevert"
 msgid "Finish setup"
 msgstr "Fullfør oppsetting"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "web tjenester du kontrollerer"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Logg ut"
 
@@ -603,6 +607,13 @@ msgstr "Logg inn"
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "forrige"
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index b86598c21eb..89e882aea20 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: Hans Nesse <>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/files_encryption.po b/l10n/nb_NO/files_encryption.po
index 0ff991d14d1..a898d9f093c 100644
--- a/l10n/nb_NO/files_encryption.po
+++ b/l10n/nb_NO/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Lagrer..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/nb_NO/files_external.po b/l10n/nb_NO/files_external.po
index 2075d40c593..2cf8ef1fd64 100644
--- a/l10n/nb_NO/files_external.po
+++ b/l10n/nb_NO/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: Hans Nesse <>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index a9a1ab26452..a330640cd92 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Last ned"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Forhåndsvisning ikke tilgjengelig for"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "web tjenester du kontrollerer"
diff --git a/l10n/nb_NO/files_trashbin.po b/l10n/nb_NO/files_trashbin.po
index 3a983dc2949..3da5b413913 100644
--- a/l10n/nb_NO/files_trashbin.po
+++ b/l10n/nb_NO/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: Hans Nesse <>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index c935187d3cb..d567f140755 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Hjelp"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Personlig"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Brukere"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Apper"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Admin"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>."
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 0d0ba6a7e6d..eca14e3c61f 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -59,7 +59,7 @@ msgstr "Ugyldig epost"
 msgid "Unable to delete group"
 msgstr "Kan ikke slette gruppe"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Kan ikke slette bruker"
 
@@ -137,16 +137,16 @@ msgstr "angre"
 msgid "Unable to remove user"
 msgstr "Kunne ikke slette bruker"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Grupper"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Gruppeadministrator"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Slett"
 
@@ -325,11 +325,11 @@ msgstr "Mer"
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Versjon"
 
-#: 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 "
@@ -339,27 +339,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Utviklet av<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud sammfunnet</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Legg til din App"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Flere Apps"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Velg en app"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Se applikasjonens side på apps.owncloud.org"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lisensiert av <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Oppdater"
 
@@ -387,76 +387,76 @@ msgstr "Feilsporing"
 msgid "Commercial Support"
 msgstr "Kommersiell støtte"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Du har brukt <strong>%s</strong> av tilgjengelig <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Få dine apps til å synkronisere dine filer"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Vis \"Førstegangs veiveiseren\" på nytt"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Du har brukt <strong>%s</strong> av tilgjengelig <strong>%s</strong>"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Passord"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Passord har blitt endret"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Kunne ikke endre passordet ditt"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Nåværende passord"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nytt passord"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Endre passord"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Visningsnavn"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "Epost"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Din e-postadresse"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Oppi epostadressen du vil tilbakestille passordet for"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Språk"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Bidra til oversettelsen"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Bruk denne adressen for å kople til ownCloud i din filbehandler"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Logginn navn"
 
@@ -464,34 +464,40 @@ msgstr "Logginn navn"
 msgid "Create"
 msgstr "Opprett"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Standard lager"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Ubegrenset"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Annet"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Lager"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "endre visningsnavn"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "sett nytt passord"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Standard"
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 2cd88e05a14..a10ed0a2d7e 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/user_webdavauth.po b/l10n/nb_NO/user_webdavauth.po
index 6228186b672..189cee27197 100644
--- a/l10n/nb_NO/user_webdavauth.po
+++ b/l10n/nb_NO/user_webdavauth.po
@@ -8,8 +8,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/ne/core.po b/l10n/ne/core.po
index bbe6f7e5afc..049092f64c4 100644
--- a/l10n/ne/core.po
+++ b/l10n/ne/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-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-14 23:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -19,26 +19,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -216,23 +197,23 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr ""
 
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -420,7 +401,19 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr ""
 
@@ -468,6 +461,21 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr ""
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -560,16 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr ""
-
-#: templates/layout.user.php:36
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:61
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr ""
 
@@ -603,6 +607,13 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr ""
diff --git a/l10n/ne/files_encryption.po b/l10n/ne/files_encryption.po
index f9b5d81ccff..6d6ca4927ed 100644
--- a/l10n/ne/files_encryption.po
+++ b/l10n/ne/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ne/files_sharing.po b/l10n/ne/files_sharing.po
index 978e72b2ebf..fa5c18ee25c 100644
--- a/l10n/ne/files_sharing.po
+++ b/l10n/ne/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-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:47+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr ""
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr ""
diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po
index e1e8ae4a62f..4c04e9f3f2d 100644
--- a/l10n/ne/settings.po
+++ b/l10n/ne/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-05-25 02:02+0200\n"
-"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"POT-Creation-Date: 2013-06-11 01:57+0200\n"
+"PO-Revision-Date: 2013-06-10 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr ""
 
@@ -324,11 +324,11 @@ msgstr ""
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr ""
 
@@ -423,39 +423,39 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:56 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:71
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/ne/user_webdavauth.po b/l10n/ne/user_webdavauth.po
index d8b30a63e35..c71f7955bdf 100644
--- a/l10n/ne/user_webdavauth.po
+++ b/l10n/ne/user_webdavauth.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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index f00c1fccf32..eec21a297ba 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
 "Last-Translator: André Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,27 +20,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "Gebruiker %s deelde een bestand met u"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "Gebruiker %s deelde een map met u"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "Gebruiker %s deelde bestand \"%s\" met u. Het is hier te downloaden: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "Gebruiker %s deelde de map \"%s\" met u. De map is hier beschikbaar voor download: %s"
+msgid "%s shared »%s« with you"
+msgstr "%s deelde »%s« met u"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -393,7 +374,7 @@ msgstr "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "ownCloud wachtwoord herstellen"
 
@@ -421,7 +402,19 @@ msgstr "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail."
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "Ja, ik wil mijn wachtwoord nu echt resetten"
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Resetaanvraag"
 
@@ -469,6 +462,21 @@ msgstr "Toegang verboden"
 msgid "Cloud not found"
 msgstr "Cloud niet gevonden"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr "Hallo daar,\n\n%s deelde %s met u.\nBekijk: %s\n\nVeel plezier!"
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "Webdiensten in eigen beheer"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Wijzig categorieën"
@@ -561,16 +569,12 @@ msgstr "Database server"
 msgid "Finish setup"
 msgstr "Installatie afronden"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "Webdiensten in eigen beheer"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s is beschikbaar. Verkrijg meer informatie over het bijwerken."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Afmelden"
 
@@ -604,6 +608,13 @@ msgstr "Meld je aan"
 msgid "Alternative Logins"
 msgstr "Alternatieve inlogs"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr "Hallo daar,<br><br> %s deelde »%s« met u.<br><a href=\"%s\">Bekijk!</a><br><br>Veel plezier!"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "vorige"
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index af31364f85c..eb4bb5e484d 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: André Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nl/files_encryption.po b/l10n/nl/files_encryption.po
index 92b7cddfd69..a2c16d01202 100644
--- a/l10n/nl/files_encryption.po
+++ b/l10n/nl/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-01 01:58+0200\n"
-"PO-Revision-Date: 2013-05-31 06:00+0000\n"
+"POT-Creation-Date: 2013-06-16 01:58+0200\n"
+"PO-Revision-Date: 2013-06-15 21:40+0000\n"
 "Last-Translator: André Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -44,61 +44,118 @@ msgstr "Wachtwoord succesvol gewijzigd."
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd."
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Opslaan"
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr "Uw privésleutel is niet geldig. Misschien was uw wachtwoord van buitenaf gewijzigd."
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr "U kunt uw privésleutel deblokkeren in uw"
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr "persoonlijke instellingen"
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Versleuteling"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr "Activeer versleuteling van wachtwoorden herstelsleutel (maak delen met herstel sleutel mogelijk):"
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr "Herstel account wachtwoord"
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr "Geactiveerd"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr "Gedeactiveerd"
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr "Wijzig versleuteling wachtwoord herstelsleutel"
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr "Oude herstel account wachtwoord"
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr "Nieuwe herstel account wachtwoord"
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr "Wijzigen wachtwoord"
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
-msgstr "Activeer wachtwoordherstel door alle bestanden met uw beheerder te delen:"
-
 #: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr "Als u uw oude wachtwoord niet meer weet, kunt u uw beheerder vragen uw bestanden terug te halen."
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr "Oude wachtwoord"
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr "Huidige wachtwoord"
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr "Bijwerken wachtwoord Privésleutel"
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr "Activeren wachtwoord herstel:"
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
-msgstr "Door deze optie te activeren kunt u toegang tot uw versleutelde bestanden krijgen als u uw wachtwoord kwijt bent"
+"files in case of password loss"
+msgstr "Het activeren van deze optie maakt het mogelijk om uw versleutelde bestanden te benaderen als uw wachtwoord kwijt is"
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr "Bestandsherstel instellingen bijgewerkt"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr "Kon bestandsherstel niet bijwerken"
diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po
index 498aa1b544a..b74e83850bd 100644
--- a/l10n/nl/files_external.po
+++ b/l10n/nl/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: André Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index 20a7e6a7d08..7e3c9962d97 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Downloaden"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Geen voorbeeldweergave beschikbaar voor"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "Webdiensten in eigen beheer"
diff --git a/l10n/nl/files_trashbin.po b/l10n/nl/files_trashbin.po
index 5c58fa41d71..306a7055f2d 100644
--- a/l10n/nl/files_trashbin.po
+++ b/l10n/nl/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index 8baa981e840..6d033c861da 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: André Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Help"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Persoonlijk"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Instellingen"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Gebruikers"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Beheerder"
 
@@ -114,76 +114,76 @@ msgstr "%s er mogen geen puntjes in de databasenaam voorkomen"
 msgid "%s set the database host."
 msgstr "%s instellen databaseservernaam."
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL gebruikersnaam en/of wachtwoord ongeldig"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Geef of een bestaand account op of het beheerdersaccount."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr "Er kon geen verbinding met Oracle worden bereikt"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL gebruikersnaam en/of wachtwoord ongeldig"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB Fout: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Onjuiste commande was: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL gebruiker '%s'@'localhost' bestaat al."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Verwijder deze gebruiker uit MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL gebruiker '%s'@'%%' bestaat al"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Verwijder deze gebruiker uit MySQL."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle gebruikersnaam en/of wachtwoord ongeldig"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Onjuiste commando was: \"%s\", naam: %s, wachtwoord: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL gebruikersnaam en/of wachtwoord niet geldig: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Controleer de <a href='%s'>installatiehandleiding</a> goed."
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 3832da32cb2..8ecf552fa01 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: helonaut\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: André Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,7 +60,7 @@ msgstr "Ongeldige e-mail"
 msgid "Unable to delete group"
 msgstr "Niet in staat om groep te verwijderen"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Niet in staat om gebruiker te verwijderen"
 
@@ -138,16 +138,16 @@ msgstr "ongedaan maken"
 msgid "Unable to remove user"
 msgstr "Kon gebruiker niet verwijderen"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Groepen"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Groep beheerder"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Verwijder"
 
@@ -326,11 +326,11 @@ msgstr "Meer"
 msgid "Less"
 msgstr "Minder"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Versie"
 
-#: 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 "
@@ -340,27 +340,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">bron code</a> is gelicenseerd onder de <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "App toevoegen"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Meer apps"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Selecteer een app"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Zie de applicatiepagina op apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-Gelicenseerd door <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Bijwerken"
 
@@ -388,76 +388,76 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Commerciële ondersteuning"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Je hebt <strong>%s</strong> gebruikt van de beschikbare <strong>%s<strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Download de apps om bestanden te syncen"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Toon de Eerste start Wizard opnieuw"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Je hebt <strong>%s</strong> gebruikt van de beschikbare <strong>%s<strong>"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Je wachtwoord is veranderd"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Niet in staat om uw wachtwoord te wijzigen"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Huidig wachtwoord"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nieuw"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Wijzig wachtwoord"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Weergavenaam"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "E-mailadres"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Uw e-mailadres"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Vul een mailadres in om je wachtwoord te kunnen herstellen"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Taal"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Help met vertalen"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Gebruik dit adres om te verbinden met uw ownCloud in uw bestandsbeheer"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Inlognaam"
 
@@ -465,34 +465,40 @@ msgstr "Inlognaam"
 msgid "Create"
 msgstr "Creëer"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr "Beheer herstel wachtwoord"
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr "Voer het herstel wachtwoord in om de gebruikersbestanden terug te halen bij wachtwoordwijziging"
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Standaard Opslaglimiet"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Ongelimiteerd"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Anders"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Opslaglimiet"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "wijzig weergavenaam"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "Instellen nieuw wachtwoord"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Standaard"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index d109ba57252..0b26e037967 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: André Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nl/user_webdavauth.po b/l10n/nl/user_webdavauth.po
index 9cd0fb7d2e0..16a063e349f 100644
--- a/l10n/nl/user_webdavauth.po
+++ b/l10n/nl/user_webdavauth.po
@@ -9,9 +9,9 @@ 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:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-16 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 21:40+0000\n"
+"Last-Translator: André Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,8 +24,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV authenticatie"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr "URL: "
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 88e61ad1bcc..04991fdf885 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
-"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,27 +21,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "Brukaren %s delte ei fil med deg"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "Brukaren %s delte ei mappe med deg"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "Brukaren %s delte fila «%s» med deg. Du kan lasta ho ned her: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "Brukaren %s delte mappa «%s» med deg. Du kan lasta ho ned her: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -394,7 +375,7 @@ msgstr "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https:/
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Oppdateringa er fullført. Sender deg vidare til ownCloud no."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "Nullstilling av ownCloud-passord"
 
@@ -422,7 +403,19 @@ msgstr "Du vil få ein e-post med ei lenkje for å nullstilla passordet."
 msgid "Username"
 msgstr "Brukarnamn"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Be om nullstilling"
 
@@ -470,6 +463,21 @@ msgstr "Tilgang forbudt"
 msgid "Cloud not found"
 msgstr "Fann ikkje skyen"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "Vev tjenester under din kontroll"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Endra kategoriar"
@@ -562,16 +570,12 @@ msgstr "Databasetenar"
 msgid "Finish setup"
 msgstr "Fullfør oppsettet"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "Vevtenester under din kontroll"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s er tilgjengeleg. Få meir informasjon om korleis du oppdaterer."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Logg ut"
 
@@ -605,6 +609,13 @@ msgstr "Logg inn"
 msgid "Alternative Logins"
 msgstr "Alternative innloggingar"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "førre"
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index c4c2318dc02..5b8d9321ef9 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: unhammer <unhammer+dill@mm.st>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/files_encryption.po b/l10n/nn_NO/files_encryption.po
index 03d96695bf5..a060c341931 100644
--- a/l10n/nn_NO/files_encryption.po
+++ b/l10n/nn_NO/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Lagrar …"
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/nn_NO/files_external.po b/l10n/nn_NO/files_external.po
index 9f63e8714b4..5f10dfcb13d 100644
--- a/l10n/nn_NO/files_external.po
+++ b/l10n/nn_NO/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index dca33ac872e..99ad81bf4ac 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +43,3 @@ msgstr "Last ned"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Inga førehandsvising tilgjengeleg for"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "Vev tjenester under din kontroll"
diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po
index 99282fd9896..e371c5937ab 100644
--- a/l10n/nn_NO/files_trashbin.po
+++ b/l10n/nn_NO/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: unhammer <unhammer+dill@mm.st>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index ae0a85d5058..61ea95d973a 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: unhammer <unhammer+dill@mm.st>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Hjelp"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Personleg"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Brukarar"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Program"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Administrer"
 
@@ -114,76 +114,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Ver vennleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>."
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index d678b612a12..b5fe6d1eda6 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -60,7 +60,7 @@ msgstr "Ugyldig e-postadresse"
 msgid "Unable to delete group"
 msgstr "Klarte ikkje å sletta gruppa"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Klarte ikkje sletta brukaren"
 
@@ -138,16 +138,16 @@ msgstr "angra"
 msgid "Unable to remove user"
 msgstr "Klarte ikkje fjerna brukaren"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Grupper"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Gruppestyrar"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Slett"
 
@@ -326,11 +326,11 @@ msgstr "Meir"
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Utgåve"
 
-#: 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 "
@@ -340,27 +340,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "<a href=\"https://github.com/owncloud\" target=\"_blank\">Kjeldekoden</a>, utvikla av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>, er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Legg til din app"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Fleire app-ar"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Vel eit program"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Sjå programsida på apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "Lisensiert under <span class=\"licence\"></span> av <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Oppdater"
 
@@ -388,76 +388,76 @@ msgstr "Feilsporar"
 msgid "Commercial Support"
 msgstr "Betalt brukarstøtte"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Du har brukt <strong>%s</strong> av dine tilgjengelege <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Få app-ar som kan synkronisera filene dine"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Vis Oppstartvegvisaren igjen"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Du har brukt <strong>%s</strong> av dine tilgjengelege <strong>%s</strong>"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Passord"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Passordet ditt er endra"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Klarte ikkje endra passordet"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Passord"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nytt passord"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Endra passord"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Visingsnamn"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Di epost-adresse"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Fyll inn e-postadressa di for å gjera passordgjenoppretting mogleg"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Språk"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Hjelp oss å omsetja"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Bruk denne adressa for å kopla til din ownCloud frå filhandsamaren din"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Innloggingsnamn"
 
@@ -465,34 +465,40 @@ msgstr "Innloggingsnamn"
 msgid "Create"
 msgstr "Lag"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Standardlagring"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Ubegrensa"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Anna"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Lagring"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "endra visingsnamn"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "lag nytt passord"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Standard"
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index e7b5cb93625..ec4f9c4dea5 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nn_NO/user_webdavauth.po b/l10n/nn_NO/user_webdavauth.po
index 37bb2ea522a..b281d34b07e 100644
--- a/l10n/nn_NO/user_webdavauth.po
+++ b/l10n/nn_NO/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-31 01:58+0200\n"
-"PO-Revision-Date: 2013-05-30 10:50+0000\n"
-"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,8 +23,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV-autentisering"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "Nettadresse: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index bf46e93a0d4..545c1fb0f08 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -19,26 +19,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "senhal d'ownCloud tornat botar"
 
@@ -420,7 +401,19 @@ msgstr "Reçaupràs un ligam per tornar botar ton senhal via corrièl."
 msgid "Username"
 msgstr "Non d'usancièr"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Tornar botar requesit"
 
@@ -468,6 +461,21 @@ msgstr "Acces enebit"
 msgid "Cloud not found"
 msgstr "Nívol pas trobada"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "Services web jos ton contraròtle"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Edita categorias"
@@ -560,16 +568,12 @@ msgstr "Òste de basa de donadas"
 msgid "Finish setup"
 msgstr "Configuracion acabada"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "Services web jos ton contraròtle"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Sortida"
 
@@ -603,6 +607,13 @@ msgstr "Dintrada"
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "dariièr"
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index 1a76b8b94f0..8d56be5f7e0 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/oc/files_encryption.po b/l10n/oc/files_encryption.po
index 0277916620b..aa6ce987a0b 100644
--- a/l10n/oc/files_encryption.po
+++ b/l10n/oc/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Enregistra..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/oc/files_external.po b/l10n/oc/files_external.po
index cfa3ca133c4..e4990692a70 100644
--- a/l10n/oc/files_external.po
+++ b/l10n/oc/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/oc/files_sharing.po b/l10n/oc/files_sharing.po
index 704a2037a63..c0b967f8cae 100644
--- a/l10n/oc/files_sharing.po
+++ b/l10n/oc/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Avalcarga"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "Services web jos ton contraròtle"
diff --git a/l10n/oc/files_trashbin.po b/l10n/oc/files_trashbin.po
index e80ac3f4bde..697c5388ccc 100644
--- a/l10n/oc/files_trashbin.po
+++ b/l10n/oc/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po
index 244e7a321cb..217bb5e3a7d 100644
--- a/l10n/oc/lib.po
+++ b/l10n/oc/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 00:02+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Ajuda"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Configuracion"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Usancièrs"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Admin"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index 0b88c243c33..e356f5fd508 100644
--- a/l10n/oc/settings.po
+++ b/l10n/oc/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr "Corrièl incorrècte"
 msgid "Unable to delete group"
 msgstr "Pas capable d'escafar un grop"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Pas capable d'escafar un usancièr"
 
@@ -136,16 +136,16 @@ msgstr "defar"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Grops"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Grop Admin"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Escafa"
 
@@ -324,11 +324,11 @@ msgstr "Mai d'aquò"
 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 "Ajusta ton App"
 
-#: 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 "Selecciona una applicacion"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Agacha la pagina d'applications en cò de apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licençiat per <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr ""
 
@@ -386,76 +386,76 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Senhal"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Ton senhal a cambiat"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Pas possible de cambiar ton senhal"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Senhal en cors"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Senhal novèl"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Cambia lo senhal"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "Corrièl"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Ton adreiça de corrièl"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Emplena una adreiça de corrièl per permetre lo mandadís del senhal perdut"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Lenga"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Ajuda a la revirada"
 
-#: 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:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr "Crea"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Autres"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index bdbe124d6ef..09a9eeb5268 100644
--- a/l10n/oc/user_ldap.po
+++ b/l10n/oc/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/oc/user_webdavauth.po b/l10n/oc/user_webdavauth.po
index 13f4be61602..72a127406ac 100644
--- a/l10n/oc/user_webdavauth.po
+++ b/l10n/oc/user_webdavauth.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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index eaf8447ec8e..0cf3d1eca72 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,27 +21,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "Użytkownik %s udostępnił ci plik"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "Użytkownik %s udostępnił ci folder"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "Użytkownik %s udostępnił ci plik „%s”. Możesz pobrać go stąd: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "Użytkownik %s udostępnił ci folder „%s”. Możesz pobrać go stąd: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -394,7 +375,7 @@ msgstr "Aktualizacja zakończyła się niepowodzeniem. Zgłoś ten problem <a hr
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "restart hasła ownCloud"
 
@@ -422,7 +403,19 @@ msgstr "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Żądanie resetowania"
 
@@ -470,6 +463,21 @@ msgstr "Dostęp zabroniony"
 msgid "Cloud not found"
 msgstr "Nie odnaleziono chmury"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "Kontrolowane serwisy"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Edytuj kategorie"
@@ -562,16 +570,12 @@ msgstr "Komputer bazy danych"
 msgid "Finish setup"
 msgstr "Zakończ konfigurowanie"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "Kontrolowane serwisy"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s jest dostępna. Dowiedz się więcej na temat aktualizacji."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Wyloguj"
 
@@ -605,6 +609,13 @@ msgstr "Zaloguj"
 msgid "Alternative Logins"
 msgstr "Alternatywne loginy"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "wstecz"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 83f8b98f225..dd227738128 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: adbrand <pkwiecin@adbrand.pl>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pl/files_encryption.po b/l10n/pl/files_encryption.po
index 5c3311df32b..3add4b19665 100644
--- a/l10n/pl/files_encryption.po
+++ b/l10n/pl/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -44,61 +44,118 @@ msgstr "Zmiana hasła udana."
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr "Nie można zmienić hasła. Może stare hasło nie było poprawne."
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Zapisywanie..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Szyfrowanie"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr "Włącz szyfrowanie odzyskiwanych haseł klucza (zezwalaj na odzyskiwanie klucza):"
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr "Odzyskiwanie hasła konta"
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr "Włączone"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr "Wyłączone"
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr "Zmiana klucza szyfrowania haseł odzyskiwania:"
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr "Stare hasło odzyskiwania"
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr "Nowe hasło odzyskiwania"
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr "Zmień hasło"
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
-msgstr "Włączyć hasło odzyskiwania przez udostępnianie wszystkich plików z administratorem:"
-
 #: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
-msgstr "Włączenie tej opcji umożliwia otrzymać dostęp do zaszyfrowanych plików w przypadku utraty hasła"
+"files in case of password loss"
+msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr "Ustawienia odzyskiwania plików zmienione"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr "Nie można zmienić pliku odzyskiwania"
diff --git a/l10n/pl/files_external.po b/l10n/pl/files_external.po
index 98f6a3172ee..f6288b915c3 100644
--- a/l10n/pl/files_external.po
+++ b/l10n/pl/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index 9758b743af6..afe0c1c6205 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Pobierz"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Podgląd nie jest dostępny dla"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "Kontrolowane serwisy"
diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po
index 89d83300611..e7dd38d8e91 100644
--- a/l10n/pl/files_trashbin.po
+++ b/l10n/pl/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po
index 544a98b1b29..ae1066f6e15 100644
--- a/l10n/pl/lib.po
+++ b/l10n/pl/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Pomoc"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Osobiste"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Aplikacje"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Administrator"
 
@@ -114,76 +114,76 @@ msgstr "%s nie można używać kropki w nazwie bazy danych"
 msgid "%s set the database host."
 msgstr "%s ustaw hosta bazy danych."
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL: Nazwa użytkownika i/lub hasło jest niepoprawne"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Należy wprowadzić istniejące konto użytkownika lub  administratora."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr "Nie można ustanowić połączenia z bazą Oracle"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL: Nazwa użytkownika i/lub hasło jest niepoprawne"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Błąd DB: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Niepoprawna komenda: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Użytkownik MySQL  '%s'@'localhost' już istnieje"
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Usuń tego użytkownika z MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Użytkownik MySQL  '%s'@'%%t' już istnieje"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Usuń tego użytkownika z MySQL."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle: Nazwa użytkownika i/lub hasło jest niepoprawne"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Niepoprawne polecania:  \"%s\", nazwa: %s, hasło: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Nazwa i/lub hasło serwera MS SQL jest niepoprawne: %s."
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>."
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index d28e3be0372..127dac3d6c4 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,7 +60,7 @@ msgstr "Nieprawidłowy e-mail"
 msgid "Unable to delete group"
 msgstr "Nie można usunąć grupy"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Nie można usunąć użytkownika"
 
@@ -138,16 +138,16 @@ msgstr "cofnij"
 msgid "Unable to remove user"
 msgstr "Nie można usunąć użytkownika"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Grupy"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Administrator grupy"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Usuń"
 
@@ -326,11 +326,11 @@ msgstr "Więcej"
 msgid "Less"
 msgstr "Mniej"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Wersja"
 
-#: 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 "
@@ -340,27 +340,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\">społeczność ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Dodaj swoją aplikację"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Więcej aplikacji"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Zaznacz aplikację"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Zobacz stronę aplikacji na apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licencjonowane przez <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Aktualizuj"
 
@@ -388,76 +388,76 @@ msgstr "Zgłaszanie błędów"
 msgid "Commercial Support"
 msgstr "Wsparcie komercyjne"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Wykorzystujesz <strong>%s</strong> z dostępnych <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Pobierz aplikacje żeby synchronizować swoje pliki"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Uruchom ponownie kreatora pierwszego uruchomienia"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Wykorzystujesz <strong>%s</strong> z dostępnych <strong>%s</strong>"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Hasło"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Twoje hasło zostało zmienione"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Nie można zmienić hasła"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Bieżące hasło"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Zmień hasło"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Wyświetlana nazwa"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Twój adres e-mail"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Podaj adres e-mail, aby uzyskać możliwość odzyskania hasła"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Język"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Pomóż w tłumaczeniu"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Użyj tego adresu aby podłączyć zasób ownCloud w menedżerze plików"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Login"
 
@@ -465,34 +465,40 @@ msgstr "Login"
 msgid "Create"
 msgstr "Utwórz"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr "Odzyskiwanie hasła administratora"
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Magazyn domyślny"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Bez limitu"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Inne"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Magazyn"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "zmień wyświetlaną nazwę"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "ustaw nowe hasło"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Domyślny"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index a03ad7450d7..336f9eec0e8 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: orcio6 <orcio6@o2.pl>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pl/user_webdavauth.po b/l10n/pl/user_webdavauth.po
index 0f5ded49b50..4b08a260393 100644
--- a/l10n/pl/user_webdavauth.po
+++ b/l10n/pl/user_webdavauth.po
@@ -10,8 +10,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgid "WebDAV Authentication"
 msgstr "Uwierzytelnienie WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 3a7e54210ff..e98aaa1d1a6 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,27 +20,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "O usuário %s compartilhou um arquivo com você"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "O usuário %s compartilhou uma pasta com você"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "O usuário %s compartilhou com você o arquivo \"%s\", que está disponível para download em: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "O usuário %s compartilhou com você a pasta \"%s\", que está disponível para download em: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -393,7 +374,7 @@ msgstr "A atualização falhou. Por favor, relate este problema para a <a href=\
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "A atualização teve êxito. Você será redirecionado ao ownCloud agora."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "Redefinir senha ownCloud"
 
@@ -421,7 +402,19 @@ msgstr "Você receberá um link para redefinir sua senha por e-mail."
 msgid "Username"
 msgstr "Nome de usuário"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Pedir redefinição"
 
@@ -469,6 +462,21 @@ msgstr "Acesso proibido"
 msgid "Cloud not found"
 msgstr "Cloud não encontrado"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "serviços web sob seu controle"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Editar categorias"
@@ -561,16 +569,12 @@ msgstr "Host do banco de dados"
 msgid "Finish setup"
 msgstr "Concluir configuração"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "serviços web sob seu controle"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s está disponível. Obtenha mais informações sobre como atualizar."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Sair"
 
@@ -604,6 +608,13 @@ msgstr "Fazer login"
 msgid "Alternative Logins"
 msgstr "Logins alternativos"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "anterior"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 45c64bce8da..f635bf45d7a 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/files_encryption.po b/l10n/pt_BR/files_encryption.po
index 406cccd3c9d..1a19c427670 100644
--- a/l10n/pt_BR/files_encryption.po
+++ b/l10n/pt_BR/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-01 01:58+0200\n"
-"PO-Revision-Date: 2013-05-31 12:00+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,61 +44,118 @@ msgstr "Senha alterada com sucesso."
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr "Não foi possível alterar a senha. Talvez a senha antiga não estava correta."
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Salvando..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Criptografia"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr "Ativar a criptografia de chave de recuperação de senhas (permitir compartilhar a chave de recuperação):"
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr "Recuperar a senha da conta"
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr "Habilidado"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr "Desabilitado"
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr "Mudar a criptografia de chave de recuperação de senhas:"
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr "Recuperação de senha de conta antiga"
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr "Senha Nova  da conta de Recuperação"
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr "Trocar Senha"
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
-msgstr "Habilitar recuperação de senha através da partilha de todos os arquivos com o administrador:"
-
 #: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
-msgstr "Ativando esta opção irá permitir que você reobtainha acesso aos seus arquivos criptografados se sua senha for perdida"
+"files in case of password loss"
+msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr "Configurações de recuperação de arquivo atualizado"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr "Não foi possível atualizar a recuperação de arquivos"
diff --git a/l10n/pt_BR/files_external.po b/l10n/pt_BR/files_external.po
index 969d08eae83..1745a7157c7 100644
--- a/l10n/pt_BR/files_external.po
+++ b/l10n/pt_BR/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index e2cce3fd3c7..45b58395a92 100644
--- a/l10n/pt_BR/files_sharing.po
+++ b/l10n/pt_BR/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Baixar"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Nenhuma visualização disponível para"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "serviços web sob seu controle"
diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po
index ba65453957b..60e965a2512 100644
--- a/l10n/pt_BR/files_trashbin.po
+++ b/l10n/pt_BR/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index 8bdcf5164e1..85b52f94aa9 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Ajuda"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Pessoal"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Ajustes"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Usuários"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Aplicações"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Admin"
 
@@ -114,76 +114,76 @@ msgstr "%s você não pode usar pontos no nome do banco de dados"
 msgid "%s set the database host."
 msgstr "%s defina o host do banco de dados."
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nome de usuário e/ou senha PostgreSQL inválido(s)"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Você precisa inserir uma conta existente ou o administrador."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr "Conexão Oracle não pode ser estabelecida"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "Nome de usuário e/ou senha MySQL inválido(s)"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Erro no BD: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Comando ofensivo era: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "O usuário MySQL '%s'@'localhost' já existe."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Derrubar este usuário do MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Usuário MySQL '%s'@'%%' já existe"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Derrube este usuário do MySQL."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Nome de usuário e/ou senha Oracle inválido(s)"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Comando ofensivo era: \"%s\", nome: %s, senha: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Nome de usuário e/ou senha MS SQL inválido(s): %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece estar quebrada."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor, confira os <a href='%s'>guias de instalação</a>."
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 6b725ef9110..5caa4961bd2 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# bjamalaro <bjamalaro@yahoo.com.br>, 2013
 # Flávio Veras <flaviove@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: bjamalaro <bjamalaro@yahoo.com.br>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,7 +60,7 @@ msgstr "E-mail inválido"
 msgid "Unable to delete group"
 msgstr "Não foi possível remover grupo"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Não foi possível remover usuário"
 
@@ -137,16 +138,16 @@ msgstr "desfazer"
 msgid "Unable to remove user"
 msgstr "Impossível remover usuário"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Grupo Administrativo"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Excluir"
 
@@ -325,11 +326,11 @@ msgstr "Mais"
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Versão"
 
-#: 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 "
@@ -339,27 +340,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Adicione seu Aplicativo"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Mais Apps"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Selecione um Aplicativo"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Ver página do aplicativo em apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Atualizar"
 
@@ -387,76 +388,76 @@ msgstr "Rastreador de Bugs"
 msgid "Commercial Support"
 msgstr "Suporte Comercial"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Você usou <strong>%s</strong> do seu espaço de <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Faça com que os apps sincronize seus arquivos"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Mostrar este Assistente de novo"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Você usou <strong>%s</strong> do seu espaço de <strong>%s</strong>"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Senha"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Sua senha foi alterada"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Não é possivel alterar a sua senha"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Senha atual"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nova senha"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Alterar senha"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Nome de Exibição"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Seu endereço de e-mail"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Preencha um endereço de e-mail para habilitar a recuperação de senha"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Ajude a traduzir"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Usar este endereço para conectar-se ao seu ownCloud no seu gerenciador de arquivos"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Nome de Login"
 
@@ -464,34 +465,40 @@ msgstr "Nome de Login"
 msgid "Create"
 msgstr "Criar"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr "Recuperação da Senha do Administrador"
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr "Digite a senha de recuperação para recuperar os arquivos dos usuários durante a mudança de senha."
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Armazenamento Padrão"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Armazenamento"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "alterar nome de exibição"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "definir nova senha"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Padrão"
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index 739d302b673..f4a891cfce7 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/user_webdavauth.po b/l10n/pt_BR/user_webdavauth.po
index ef503e227b1..0b37738524a 100644
--- a/l10n/pt_BR/user_webdavauth.po
+++ b/l10n/pt_BR/user_webdavauth.po
@@ -9,8 +9,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "WebDAV Authentication"
 msgstr "Autenticação WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 5249521a898..3fa25d8d116 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
-"Last-Translator: bmgmatias <bmgmatias@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,27 +21,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "O utilizador %s partilhou um ficheiro consigo."
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "O utilizador %s partilhou uma pasta consigo."
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "O utilizador %s partilhou o ficheiro \"%s\" consigo. Está disponível para download aqui: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "O utilizador %s partilhou a pasta \"%s\" consigo. Está disponível para download aqui: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -394,7 +375,7 @@ msgstr "A actualização falhou. Por favor reporte este incidente seguindo este
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "Reposição da password ownCloud"
 
@@ -422,7 +403,19 @@ msgstr "Vai receber um endereço para repor a sua password"
 msgid "Username"
 msgstr "Nome de utilizador"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Pedir reposição"
 
@@ -470,6 +463,21 @@ msgstr "Acesso interdito"
 msgid "Cloud not found"
 msgstr "Cloud nao encontrada"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "serviços web sob o seu controlo"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Editar categorias"
@@ -562,16 +570,12 @@ msgstr "Anfitrião da base de dados"
 msgid "Finish setup"
 msgstr "Acabar instalação"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "serviços web sob o seu controlo"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s está disponível. Tenha mais informações como actualizar."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Sair"
 
@@ -605,6 +609,13 @@ msgstr "Entrar"
 msgid "Alternative Logins"
 msgstr "Contas de acesso alternativas"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "anterior"
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 100d39e2394..3dea965f390 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: bmgmatias <bmgmatias@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/files_encryption.po b/l10n/pt_PT/files_encryption.po
index 0cba5c44e38..235135a664d 100644
--- a/l10n/pt_PT/files_encryption.po
+++ b/l10n/pt_PT/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mouxy <daniel@mouxy.net>, 2013
 # Helder Meneses <helder.meneses@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -20,21 +21,21 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Chave de recuperação activada com sucesso"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Não foi possível activar a chave de recuperação. Por favor verifique a password da chave de recuperação!"
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Chave de recuperação descativada com sucesso"
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Não foi possível desactivar a chave de recuperação. Por favor verifique a password da chave de recuperação."
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
@@ -44,61 +45,118 @@ msgstr "Password alterada com sucesso."
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr "Não foi possivel alterar a password. Possivelmente a password antiga não está correcta."
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "A guardar..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Encriptação"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
-msgstr ""
+msgstr "Activar a chave de recuperação das passwords de encriptação (permitir partilha da chave de recuperação):"
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
-msgstr ""
+msgstr "Password de recuperação de conta"
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr "Activado"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
-msgstr ""
+msgstr "Alterar a chave de recuperação da password de encriptação:"
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
-msgstr ""
+msgstr "Password de recuperação de conta antiga:"
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
-msgstr ""
+msgstr "Nova password de recuperação de conta"
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr "Mudar a Password"
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
-msgstr ""
+msgstr "Actualizadas as definições de recuperação de ficheiros"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
-msgstr ""
+msgstr "Não foi possível actualizar a recuperação de ficheiros"
diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po
index ffb85d726fa..b867812cd04 100644
--- a/l10n/pt_PT/files_external.po
+++ b/l10n/pt_PT/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: Mouxy <daniel@mouxy.net>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index 13e5fc89026..81473e83043 100644
--- a/l10n/pt_PT/files_sharing.po
+++ b/l10n/pt_PT/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Transferir"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Não há pré-visualização para"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "serviços web sob o seu controlo"
diff --git a/l10n/pt_PT/files_trashbin.po b/l10n/pt_PT/files_trashbin.po
index a08a4f95abc..f98670bd669 100644
--- a/l10n/pt_PT/files_trashbin.po
+++ b/l10n/pt_PT/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index 16196c2d730..2cca0274ec7 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Ajuda"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Pessoal"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Configurações"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Utilizadores"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Aplicações"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Admin"
 
@@ -114,76 +114,76 @@ msgstr "%s não é permitido utilizar pontos (.) no nome da base de dados"
 msgid "%s set the database host."
 msgstr "%s defina o servidor da base de dados (geralmente localhost)"
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Nome de utilizador/password do PostgreSQL inválido"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Precisa de introduzir uma conta existente ou de administrador"
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr "Não foi possível estabelecer a ligação Oracle"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "Nome de utilizador/password do MySQL inválida"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Erro na BD: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "O comando gerador de erro foi: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "O utilizador '%s'@'localhost' do MySQL já existe."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Eliminar este utilizador do MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "O utilizador '%s'@'%%' do MySQL já existe"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Eliminar este utilizador do MySQL"
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Nome de utilizador/password do Oracle inválida"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "O comando gerador de erro foi: \"%s\", nome: %s, password: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Nome de utilizador/password do MySQL é inválido: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor verifique <a href='%s'>installation guides</a>."
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index ba546d0b3a3..a54d1599e77 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -5,13 +5,14 @@
 # Translators:
 # bmgmatias <bmgmatias@gmail.com>, 2013
 # Mouxy <daniel@mouxy.net>, 2013
+# Nelson Rosado <nelsontrosado@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: bmgmatias <bmgmatias@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: Nelson Rosado <nelsontrosado@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,7 +61,7 @@ msgstr "Email inválido"
 msgid "Unable to delete group"
 msgstr "Impossível apagar grupo"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Impossível apagar utilizador"
 
@@ -138,16 +139,16 @@ msgstr "desfazer"
 msgid "Unable to remove user"
 msgstr "Não foi possível remover o utilizador"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Grupo Administrador"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -326,11 +327,11 @@ msgstr "Mais"
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Versão"
 
-#: 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 "
@@ -340,27 +341,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o<a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Adicione a sua aplicação"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Mais Aplicações"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Selecione uma aplicação"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Ver a página da aplicação em apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Actualizar"
 
@@ -388,76 +389,76 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Suporte Comercial"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Usou <strong>%s</strong> do disponivel <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Obtenha as aplicações para sincronizar os seus ficheiros"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Mostrar novamente Wizard de Arranque Inicial"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Usou <strong>%s</strong> do disponivel <strong>%s</strong>"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Password"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "A sua palavra-passe foi alterada"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Não foi possivel alterar a sua palavra-chave"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Palavra-chave actual"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nova palavra-chave"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Alterar palavra-chave"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Nome público"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "O seu endereço de email"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Preencha com o seu endereço de email para ativar a recuperação da palavra-chave"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Ajude a traduzir"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Use este endereço no seu gestor de ficheiros para ligar à sua ownCloud"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Nome de utilizador"
 
@@ -465,34 +466,40 @@ msgstr "Nome de utilizador"
 msgid "Create"
 msgstr "Criar"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr "Recuperar password de administrador"
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr "Digite a senha de recuperação, a fim de recuperar os arquivos de usuários durante a mudança de senha"
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Armazenamento Padrão"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Armazenamento"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "modificar nome exibido"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "definir nova palavra-passe"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Padrão"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index 9498aa4766f..3a79c47da02 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mouxy <daniel@mouxy.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
+"Last-Translator: Mouxy <daniel@mouxy.net>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: ajax/clearMappings.php:34
 msgid "Failed to clear the mappings."
-msgstr ""
+msgstr "Falhou a limpar os mapas"
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
@@ -59,7 +60,7 @@ msgstr "Não foi possível adicionar as configurações do servidor."
 
 #: js/settings.js:111
 msgid "mappings cleared"
-msgstr ""
+msgstr "Mapas limpos"
 
 #: js/settings.js:112
 msgid "Success"
@@ -342,7 +343,7 @@ msgstr "Deixe vazio para nome de utilizador (padrão). De outro modo, especifiqu
 
 #: templates/settings.php:101
 msgid "Internal Username"
-msgstr ""
+msgstr "Nome de utilizador interno"
 
 #: templates/settings.php:102
 msgid ""
@@ -362,11 +363,11 @@ msgstr ""
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
-msgstr ""
+msgstr "Atributo do nome de utilizador interno"
 
 #: templates/settings.php:104
 msgid "Override UUID detection"
-msgstr ""
+msgstr "Passar a detecção do UUID"
 
 #: templates/settings.php:105
 msgid ""
@@ -381,11 +382,11 @@ msgstr ""
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
-msgstr ""
+msgstr "Atributo UUID:"
 
 #: templates/settings.php:107
 msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "Mapeamento do utilizador LDAP"
 
 #: templates/settings.php:108
 msgid ""
@@ -404,11 +405,11 @@ msgstr ""
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "Limpar mapeamento do utilizador-LDAP"
 
 #: templates/settings.php:109
 msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "Limpar o mapeamento do nome de grupo LDAP"
 
 #: templates/settings.php:111
 msgid "Test Configuration"
diff --git a/l10n/pt_PT/user_webdavauth.po b/l10n/pt_PT/user_webdavauth.po
index e7e520a00af..bee54e46dab 100644
--- a/l10n/pt_PT/user_webdavauth.po
+++ b/l10n/pt_PT/user_webdavauth.po
@@ -9,8 +9,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "WebDAV Authentication"
 msgstr "Autenticação WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 89d4fee6768..703aa55f95b 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -20,27 +20,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "Utilizatorul %s a partajat un fișier cu tine"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "Utilizatorul %s a partajat un dosar cu tine"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "Utilizatorul %s a partajat fișierul \"%s\" cu tine. Îl poți descărca de aici: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "Utilizatorul %s a partajat dosarul \"%s\" cu tine. Îl poți descărca de aici: %s "
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -393,7 +374,7 @@ msgstr "Modernizarea a eșuat! <a href=\"https://github.com/owncloud/core/issues
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Modernizare reusita! Vei fii redirectionat!"
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "Resetarea parolei ownCloud "
 
@@ -421,7 +402,19 @@ msgstr "Vei primi un mesaj prin care vei putea reseta parola via email"
 msgid "Username"
 msgstr "Nume utilizator"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Cerere trimisă"
 
@@ -469,6 +462,21 @@ msgstr "Acces interzis"
 msgid "Cloud not found"
 msgstr "Nu s-a găsit"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "servicii web controlate de tine"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Editează categorii"
@@ -561,16 +569,12 @@ msgstr "Bază date"
 msgid "Finish setup"
 msgstr "Finalizează instalarea"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "servicii web controlate de tine"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Ieșire"
 
@@ -604,6 +608,13 @@ msgstr "Autentificare"
 msgid "Alternative Logins"
 msgstr "Conectări alternative"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "precedentul"
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index e4512308c24..874153b9a78 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ro/files_encryption.po b/l10n/ro/files_encryption.po
index b3f31e83871..4c006f7a60f 100644
--- a/l10n/ro/files_encryption.po
+++ b/l10n/ro/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Se salvează..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Încriptare"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ro/files_external.po b/l10n/ro/files_external.po
index 947f0726078..8a939852e65 100644
--- a/l10n/ro/files_external.po
+++ b/l10n/ro/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index 61cb1199de0..2662cb73227 100644
--- a/l10n/ro/files_sharing.po
+++ b/l10n/ro/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Descarcă"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Nici o previzualizare disponibilă pentru "
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "servicii web controlate de tine"
diff --git a/l10n/ro/files_trashbin.po b/l10n/ro/files_trashbin.po
index 36eb61a0a2a..0ac40c75707 100644
--- a/l10n/ro/files_trashbin.po
+++ b/l10n/ro/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
index c8d1ff669f5..bcd25eb14e1 100644
--- a/l10n/ro/lib.po
+++ b/l10n/ro/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Ajutor"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Setări"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Utilizatori"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Aplicații"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Admin"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index ac37dff821f..5fa551bd67c 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr "E-mail nevalid"
 msgid "Unable to delete group"
 msgstr "Nu s-a putut șterge grupul"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Nu s-a putut șterge utilizatorul"
 
@@ -136,16 +136,16 @@ msgstr "Anulează ultima acțiune"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Grupuri"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Grupul Admin "
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Șterge"
 
@@ -324,11 +324,11 @@ msgstr "Mai mult"
 msgid "Less"
 msgstr "Mai puțin"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Versiunea"
 
-#: 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 "Dezvoltat de the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitatea ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">codul sursă</a> este licențiat sub <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Adaugă aplicația ta"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Mai multe aplicații"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Selectează o aplicație"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Vizualizează pagina applicației pe apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licențiat <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Actualizare"
 
@@ -386,76 +386,76 @@ msgstr "Urmărire bug-uri"
 msgid "Commercial Support"
 msgstr "Suport comercial"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Ia acum aplicatia pentru sincronizarea fisierelor "
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Parolă"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Parola a fost modificată"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Imposibil de-ați schimbat parola"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Parola curentă"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Noua parolă"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Schimbă parola"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Adresa ta de email"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Completează o adresă de mail pentru a-ți putea recupera parola"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Limba"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Ajută la traducere"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Folosește această adresă pentru a conecta ownCloud cu managerul de fișiere"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr "Crează"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Stocare implicită"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Nelimitată"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Altele"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Stocare"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Implicită"
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 29494dfa914..0d344ebca9c 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ro/user_webdavauth.po b/l10n/ro/user_webdavauth.po
index 7c28a3a2af7..79f4ebb8a79 100644
--- a/l10n/ro/user_webdavauth.po
+++ b/l10n/ro/user_webdavauth.po
@@ -9,8 +9,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "WebDAV Authentication"
 msgstr "Autentificare WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 68c336d5e0e..340dce6738d 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
-"Last-Translator: Langaru <langaru@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,27 +22,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "Пользователь %s поделился с вами файлом"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "Пользователь %s открыл вам доступ к папке"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "Пользователь %s открыл вам доступ к файлу \"%s\". Он доступен для загрузки здесь: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "Пользователь %s открыл вам доступ к папке \"%s\". Она доступна для загрузки здесь: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -395,7 +376,7 @@ msgstr "При обновлении произошла ошибка. Пожал�
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud..."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "Сброс пароля "
 
@@ -423,7 +404,19 @@ msgstr "На ваш адрес Email выслана ссылка для сбро
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Запросить сброс"
 
@@ -471,6 +464,21 @@ msgstr "Доступ запрещён"
 msgid "Cloud not found"
 msgstr "Облако не найдено"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "веб-сервисы под вашим управлением"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Редактировать категрии"
@@ -563,16 +571,12 @@ msgstr "Хост базы данных"
 msgid "Finish setup"
 msgstr "Завершить установку"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "веб-сервисы под вашим управлением"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s доступно. Получить дополнительную информацию о порядке обновления."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Выйти"
 
@@ -606,6 +610,13 @@ msgstr "Войти"
 msgid "Alternative Logins"
 msgstr "Альтернативные имена пользователя"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "пред"
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 8b9fd67193d..fc3bc0a80e3 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: Friktor <antonshramko@yandex.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ru/files_encryption.po b/l10n/ru/files_encryption.po
index 3cb93ae3108..b1bc75c9e28 100644
--- a/l10n/ru/files_encryption.po
+++ b/l10n/ru/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -44,61 +44,118 @@ msgstr "Пароль изменен удачно."
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr "Невозможно изменить пароль. Возможно старый пароль не был верен."
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Сохранение..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Шифрование"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr "Включить шифрование пароля ключа восстановления (понадобится разрешение для восстановления ключа)"
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr "Восстановление пароля учетной записи"
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr "Включено"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr "Отключено"
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr "Изменить шифрование пароля ключа восстановления:"
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr "Старое Восстановление пароля учетной записи"
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr "Новое Восстановление пароля учетной записи"
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr "Изменить пароль"
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
-msgstr "Включить восстановление пароля путем доступа Вашего администратора ко всем файлам"
-
 #: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
-msgstr "Включение этой опции позволит вам получить доступ к зашифрованным файлам, в случае утери пароля"
+"files in case of password loss"
+msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr "Настройки файла восстановления обновлены"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr "Невозможно обновить файл восстановления"
diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po
index 9d816b3a9ce..45a5938fa78 100644
--- a/l10n/ru/files_external.po
+++ b/l10n/ru/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index 98906e9ea34..f8c6a6e1fbd 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Скачать"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Предпросмотр недоступен для"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "веб-сервисы под вашим управлением"
diff --git a/l10n/ru/files_trashbin.po b/l10n/ru/files_trashbin.po
index e74b562225c..12908e3c54b 100644
--- a/l10n/ru/files_trashbin.po
+++ b/l10n/ru/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index 5bc02d8d6be..5009f6f9912 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: Friktor <antonshramko@yandex.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Помощь"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Личное"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Конфигурация"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Пользователи"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Приложения"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Admin"
 
@@ -114,76 +114,76 @@ msgstr "%s Вы не можете использовать точки в име�
 msgid "%s set the database host."
 msgstr "%s задайте хост базы данных."
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Неверное имя пользователя и/или пароль PostgreSQL"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Вы должны войти или в существующий аккаунт или под администратором."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr "соединение с Oracle не может быть установлено"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "Неверное имя пользователя и/или пароль MySQL"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Ошибка БД: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Вызываемая команда была: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Пользователь MySQL '%s'@'localhost' уже существует."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Удалить этого пользователя из MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Пользователь MySQL '%s'@'%%' уже существует"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Удалить этого пользователя из MySQL."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Неверное имя пользователя и/или пароль Oracle"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Вызываемая команда была: \"%s\", имя: %s, пароль: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Имя пользователя и/или пароль MS SQL не подходит: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ваш веб сервер до сих пор не настроен правильно для возможности синхронизации файлов, похоже что проблема в неисправности интерфейса WebDAV."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>."
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index f9763461239..8eb83bf0302 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: Friktor <antonshramko@yandex.ru>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,7 +60,7 @@ msgstr "Неправильный Email"
 msgid "Unable to delete group"
 msgstr "Невозможно удалить группу"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Невозможно удалить пользователя"
 
@@ -138,16 +138,16 @@ msgstr "отмена"
 msgid "Unable to remove user"
 msgstr "Невозможно удалить пользователя"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Группы"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Группа Администраторы"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Удалить"
 
@@ -326,11 +326,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 "
@@ -340,27 +340,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: 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 "Смотрите дополнения на apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span> лицензия. Автор <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Обновить"
 
@@ -388,76 +388,76 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Коммерческая поддержка"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Вы использовали <strong>%s</strong> из доступных <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Получить приложения для синхронизации ваших файлов"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Показать помощник настройки"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Вы использовали <strong>%s</strong> из доступных <strong>%s</strong>"
+
+#: 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:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Отображаемое имя"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "E-mail"
 
-#: 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 "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Используйте этот URL для подключения файлового менеджера к Вашему хранилищу"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Имя пользователя"
 
@@ -465,34 +465,40 @@ msgstr "Имя пользователя"
 msgid "Create"
 msgstr "Создать"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr "Восстановление Пароля Администратора"
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Хранилище по-умолчанию"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Неограниченно"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Другое"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Хранилище"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "изменить отображаемое имя"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "установить новый пароль"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "По-умолчанию"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index 32d2e292b9d..e50bef440de 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: Fenuks <fenuksuh@ya.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ru/user_webdavauth.po b/l10n/ru/user_webdavauth.po
index d6d190c1eac..ad92e25e80d 100644
--- a/l10n/ru/user_webdavauth.po
+++ b/l10n/ru/user_webdavauth.po
@@ -10,8 +10,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgid "WebDAV Authentication"
 msgstr "Идентификация WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index 17fc6a8ab63..7b0b5b55966 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -19,26 +19,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "ownCloud මුරපදය ප්‍රත්‍යාරම්භ කරන්න"
 
@@ -420,7 +401,19 @@ msgstr "ඔබගේ මුරපදය ප්‍රත්‍යාරම්භ
 msgid "Username"
 msgstr "පරිශීලක නම"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr ""
 
@@ -468,6 +461,21 @@ msgstr "ඇතුල් වීම තහනම්"
 msgid "Cloud not found"
 msgstr "සොයා ගත නොහැක"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "ප්‍රභේදයන් සංස්කරණය"
@@ -560,16 +568,12 @@ msgstr "දත්තගබඩා සේවාදායකයා"
 msgid "Finish setup"
 msgstr "ස්ථාපනය කිරීම අවසන් කරන්න"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "නික්මීම"
 
@@ -603,6 +607,13 @@ msgstr "ප්‍රවේශවන්න"
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "පෙර"
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index 80c3cb3419e..ff3caa0613e 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/files_encryption.po b/l10n/si_LK/files_encryption.po
index 02b12790e76..0ccbfdf0bd0 100644
--- a/l10n/si_LK/files_encryption.po
+++ b/l10n/si_LK/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "සුරැකෙමින් පවතී..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "ගුප්ත කේතනය"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/si_LK/files_external.po b/l10n/si_LK/files_external.po
index 8adee4517be..22557191d04 100644
--- a/l10n/si_LK/files_external.po
+++ b/l10n/si_LK/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po
index 2bd504b6792..03c481103aa 100644
--- a/l10n/si_LK/files_sharing.po
+++ b/l10n/si_LK/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "බාන්න"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "පූර්වදර්ශනයක් නොමැත"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්"
diff --git a/l10n/si_LK/files_trashbin.po b/l10n/si_LK/files_trashbin.po
index 706baec00fa..e8c75ae0edb 100644
--- a/l10n/si_LK/files_trashbin.po
+++ b/l10n/si_LK/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/lib.po b/l10n/si_LK/lib.po
index 95eb13dd48d..c61ce1e7324 100644
--- a/l10n/si_LK/lib.po
+++ b/l10n/si_LK/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "උදව්"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "පෞද්ගලික"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "සිටුවම්"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "පරිශීලකයන්"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "යෙදුම්"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "පරිපාලක"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index 18fec1042a9..36accd93200 100644
--- a/l10n/si_LK/settings.po
+++ b/l10n/si_LK/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\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 "පරිශීලකයා මැකීමට නොහැක"
 
@@ -136,16 +136,16 @@ msgstr "නිෂ්ප්‍රභ කරන්න"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "කණ්ඩායම්"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "කාණ්ඩ පරිපාලක"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 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 "නිපදන ලද්දේ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud සමාජයෙන්</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">මුල් කේතය </a>ලයිසන්ස් කර ඇත්තේ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> යටතේ."
 
-#: 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
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: 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:81
+#: 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:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr "තනන්න"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "වෙනත්"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index ff1915aa946..659e656d178 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/user_webdavauth.po b/l10n/si_LK/user_webdavauth.po
index 50163948c6c..f9745043cb1 100644
--- a/l10n/si_LK/user_webdavauth.po
+++ b/l10n/si_LK/user_webdavauth.po
@@ -8,8 +8,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/sk/core.po b/l10n/sk/core.po
index fa7bfd1c9ef..4910cee063b 100644
--- a/l10n/sk/core.po
+++ b/l10n/sk/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-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-14 23:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -19,26 +19,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -216,23 +197,23 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr ""
 
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -420,7 +401,19 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr ""
 
@@ -468,6 +461,21 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr ""
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -560,16 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr ""
-
-#: templates/layout.user.php:36
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:61
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr ""
 
@@ -603,6 +607,13 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr ""
diff --git a/l10n/sk/files_encryption.po b/l10n/sk/files_encryption.po
index b91e38b4ebf..dece56ab899 100644
--- a/l10n/sk/files_encryption.po
+++ b/l10n/sk/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/sk/files_sharing.po b/l10n/sk/files_sharing.po
index 489876c2baa..c4a1511387b 100644
--- a/l10n/sk/files_sharing.po
+++ b/l10n/sk/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-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:47+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr ""
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr ""
diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po
index 09d08c8666a..145d6154a7e 100644
--- a/l10n/sk/settings.po
+++ b/l10n/sk/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-05-25 02:02+0200\n"
-"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"POT-Creation-Date: 2013-06-11 01:57+0200\n"
+"PO-Revision-Date: 2013-06-10 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr ""
 
@@ -324,11 +324,11 @@ msgstr ""
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr ""
 
@@ -423,39 +423,39 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:56 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:71
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/sk/user_webdavauth.po b/l10n/sk/user_webdavauth.po
index 7eac54f7db7..6704af8cc41 100644
--- a/l10n/sk/user_webdavauth.po
+++ b/l10n/sk/user_webdavauth.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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 42d78354876..b96fd9fb09c 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,27 +20,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "Používateľ %s zdieľa s Vami súbor"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "Používateľ %s zdieľa s Vami priečinok"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "Používateľ %s zdieľa s Vami súbor \"%s\".  Môžete si ho stiahnuť tu: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "Používateľ %s zdieľa s Vami priečinok \"%s\".  Môžete si ho stiahnuť tu: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -393,7 +374,7 @@ msgstr "Aktualizácia nebola úspešná. Problém nahláste na <a href=\"https:/
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Aktualizácia bola úspešná. Presmerovávam na prihlasovaciu stránku."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "Obnovenie hesla pre ownCloud"
 
@@ -421,7 +402,19 @@ msgstr "Odkaz pre obnovenie hesla obdržíte e-mailom."
 msgid "Username"
 msgstr "Meno používateľa"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Požiadať o obnovenie"
 
@@ -469,6 +462,21 @@ msgstr "Prístup odmietnutý"
 msgid "Cloud not found"
 msgstr "Nenájdené"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "webové služby pod Vašou kontrolou"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Upraviť kategórie"
@@ -561,16 +569,12 @@ msgstr "Server databázy"
 msgid "Finish setup"
 msgstr "Dokončiť inštaláciu"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "webové služby pod Vašou kontrolou"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s je dostupná. Získajte viac informácií k postupu aktualizáce."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Odhlásiť"
 
@@ -604,6 +608,13 @@ msgstr "Prihlásiť sa"
 msgid "Alternative Logins"
 msgstr "Alternatívne prihlasovanie"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "späť"
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index d87d7bd2973..71388424f08 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/files_encryption.po b/l10n/sk_SK/files_encryption.po
index f0b5225a7cb..05d92a7c7e7 100644
--- a/l10n/sk_SK/files_encryption.po
+++ b/l10n/sk_SK/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -44,61 +44,118 @@ msgstr "Heslo úspešne zmenené."
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Ukladám..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Šifrovanie"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr "Povolené"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr "Zakázané"
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr "Zmeniť šifrovacie heslo obnovovacieho kľúča:"
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr "Zmeniť heslo"
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr "Nastavenie obnovy súborov aktualizované"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr "Nemožno aktualizovať obnovenie súborov"
diff --git a/l10n/sk_SK/files_external.po b/l10n/sk_SK/files_external.po
index a8452cb846c..1509c8bbcb4 100644
--- a/l10n/sk_SK/files_external.po
+++ b/l10n/sk_SK/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index 6d6450c3ef7..30017153f1d 100644
--- a/l10n/sk_SK/files_sharing.po
+++ b/l10n/sk_SK/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Sťahovanie"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Žiaden náhľad k dispozícii pre"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "webové služby pod Vašou kontrolou"
diff --git a/l10n/sk_SK/files_trashbin.po b/l10n/sk_SK/files_trashbin.po
index db8b9fc0996..ee3167b8eb2 100644
--- a/l10n/sk_SK/files_trashbin.po
+++ b/l10n/sk_SK/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index e8ac3dfa372..3464d349a2e 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Pomoc"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Osobné"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Používatelia"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Aplikácie"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Administrátor"
 
@@ -114,76 +114,76 @@ msgstr "V názve databázy %s nemôžete používať bodky"
 msgid "%s set the database host."
 msgstr "Zadajte názov počítača s databázou %s."
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Používateľské meno a/alebo heslo pre PostgreSQL databázu je neplatné"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Musíte zadať jestvujúci účet alebo administrátora."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr "Nie je možné pripojiť sa k Oracle"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "Používateľské meno a/alebo heslo pre MySQL databázu je neplatné"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Chyba DB: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Podozrivý príkaz bol: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Používateľ '%s'@'localhost' už v MySQL existuje."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Zahodiť používateľa z MySQL."
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Používateľ '%s'@'%%' už v MySQL existuje"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Zahodiť používateľa z MySQL."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Používateľské meno a/alebo heslo pre Oracle databázu je neplatné"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Podozrivý príkaz bol: \"%s\", meno: %s, heslo: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Používateľské meno, alebo heslo MS SQL nie je platné: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>."
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index d2c36477253..396ba0b2687 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,7 +59,7 @@ msgstr "Neplatný email"
 msgid "Unable to delete group"
 msgstr "Nie je možné odstrániť skupinu"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Nie je možné odstrániť používateľa"
 
@@ -137,16 +137,16 @@ msgstr "vrátiť"
 msgid "Unable to remove user"
 msgstr "Nemožno odobrať používateľa"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Skupiny"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Správca skupiny"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Zmazať"
 
@@ -325,11 +325,11 @@ msgstr "Viac"
 msgid "Less"
 msgstr "Menej"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Verzia"
 
-#: 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 "
@@ -339,27 +339,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Vyvinuté <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencovaný pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Pridať vašu aplikáciu"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Viac aplikácií"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Vyberte aplikáciu"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Pozrite si stránku aplikácií na apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licencované <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Aktualizovať"
 
@@ -387,76 +387,76 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Komerčná podpora"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Použili ste <strong>%s</strong> z <strong>%s</strong> dostupných "
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Získať aplikácie na synchronizáciu Vašich súborov"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Znovu zobraziť sprievodcu prvým spustením"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Použili ste <strong>%s</strong> z <strong>%s</strong> dostupných "
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Heslo bolo zmenené"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Nie je možné zmeniť vaše heslo"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Aktuálne heslo"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nové heslo"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Zmeniť heslo"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Zobrazované meno"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Vaša emailová adresa"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Vyplňte emailovú adresu pre aktivovanie obnovy hesla"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Jazyk"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Pomôcť s prekladom"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Použite túto adresu pre pripojenie vášho ownCloud k súborovému správcovi"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Prihlasovacie meno"
 
@@ -464,34 +464,40 @@ msgstr "Prihlasovacie meno"
 msgid "Create"
 msgstr "Vytvoriť"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr "Obnovenie hesla administrátora"
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Predvolené úložisko"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Nelimitované"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Iné"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Úložisko"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "zmeniť zobrazované meno"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "nastaviť nové heslo"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Predvolené"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index f6ca2a1ef5c..18b09d05768 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/user_webdavauth.po b/l10n/sk_SK/user_webdavauth.po
index b0cb3100e75..584941b201d 100644
--- a/l10n/sk_SK/user_webdavauth.po
+++ b/l10n/sk_SK/user_webdavauth.po
@@ -9,8 +9,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV overenie"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 664db039c35..2dea4f598a5 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,27 +20,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "Uporabnik %s je omogočil souporabo datoteke"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "Uporabnik %s je omogočil souporabo mape"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "Uporabnik %s je omogočil souporabo datoteke \"%s\". Prejmete jo lahko preko povezave: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "Uporabnik %s je omogočil souporabo mape \"%s\". Prejmete jo lahko preko povezave: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -393,7 +374,7 @@ msgstr "Posodobitev ni uspela. Pošljite poročilo o napaki na sistemu <a href=\
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "Ponastavitev gesla za oblak ownCloud"
 
@@ -421,7 +402,19 @@ msgstr "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla
 msgid "Username"
 msgstr "Uporabniško ime"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Zahtevaj ponovno nastavitev"
 
@@ -469,6 +462,21 @@ msgstr "Dostop je prepovedan"
 msgid "Cloud not found"
 msgstr "Oblaka ni mogoče najti"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "spletne storitve pod vašim nadzorom"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Uredi kategorije"
@@ -561,16 +569,12 @@ msgstr "Gostitelj podatkovne zbirke"
 msgid "Finish setup"
 msgstr "Končaj namestitev"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "spletne storitve pod vašim nadzorom"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s je na voljo. Pridobite več podrobnosti za posodobitev."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Odjava"
 
@@ -604,6 +608,13 @@ msgstr "Prijava"
 msgid "Alternative Logins"
 msgstr "Druge prijavne možnosti"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "nazaj"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 080888f2dbc..c144a5d9022 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po
index b690829c5b1..e98e6030c07 100644
--- a/l10n/sl/files_encryption.po
+++ b/l10n/sl/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Poteka shranjevanje ..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Šifriranje"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
index 5c1c7987df9..9a87074d074 100644
--- a/l10n/sl/files_external.po
+++ b/l10n/sl/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index d1c13605c9d..c7c8a5d536c 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Prejmi"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Predogled ni na voljo za"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "spletne storitve pod vašim nadzorom"
diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po
index 569edc4a63e..83f2cc43101 100644
--- a/l10n/sl/files_trashbin.po
+++ b/l10n/sl/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index 4f3b3ff2037..0ff29962d0c 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Pomoč"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Osebno"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Uporabniki"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Programi"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Skrbništvo"
 
@@ -113,76 +113,76 @@ msgstr "%s - v imenu podatkovne zbirke ni dovoljeno uporabljati pik."
 msgid "%s set the database host."
 msgstr "%s - vnos gostitelja podatkovne zbirke."
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Uporabniško ime ali geslo PostgreSQL ni veljavno"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Prijaviti se je treba v obstoječi ali pa skrbniški račun."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "Uporabniško ime ali geslo MySQL ni veljavno"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Napaka podatkovne zbirke: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Napačni ukaz je: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Uporabnik MySQL '%s'@'localhost' že obstaja."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Odstrani uporabnika s podatkovne zbirke MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Uporabnik MySQL '%s'@'%%' že obstaja."
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Odstrani uporabnika s podatkovne zbirke MySQL"
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Uporabniško ime ali geslo Oracle ni veljavno"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Napačni ukaz je: \"%s\", ime: %s, geslo: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Uporabniško ime ali geslo MS SQL ni veljavno: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je nastavitev WebDAV okvarjena."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Preverite <a href='%s'>navodila namestitve</a>."
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index fca205d88ba..bfc077acf4b 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -59,7 +59,7 @@ msgstr "Neveljaven elektronski naslov"
 msgid "Unable to delete group"
 msgstr "Skupine ni mogoče izbrisati"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Uporabnika ni mogoče izbrisati"
 
@@ -137,16 +137,16 @@ msgstr "razveljavi"
 msgid "Unable to remove user"
 msgstr "Uporabnika ni mogoče odstraniti"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Skupine"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Skrbnik skupine"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Izbriši"
 
@@ -325,11 +325,11 @@ msgstr "Več"
 msgid "Less"
 msgstr "Manj"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Različica"
 
-#: 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 "
@@ -339,27 +339,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Splošnega javnega dovoljenja Affero\">AGPL</abbr></a>."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Dodaj program"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Več programov"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Izbor programa"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Obiščite spletno stran programa na apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-z dovoljenjem <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Posodobi"
 
@@ -387,76 +387,76 @@ msgstr "Sledilnik hroščev"
 msgid "Commercial Support"
 msgstr "Podpora strankam"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Uporabljenega je <strong>%s</strong> od razpoložljivih <strong>%s</strong> prostora."
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Pridobi programe za usklajevanje datotek"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Zaženi čarovnika prvega zagona"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Uporabljenega je <strong>%s</strong> od razpoložljivih <strong>%s</strong> prostora."
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Geslo"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Geslo je spremenjeno"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Gesla ni mogoče spremeniti."
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Trenutno geslo"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Novo geslo"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Spremeni geslo"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Prikazano ime"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "Elektronski naslov"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Osebni elektronski naslov"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Vpišite osebni elektronski naslov in s tem omogočite obnovitev gesla"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Jezik"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Sodelujte pri prevajanju"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Ta naslov uporabite za povezavo upravljalnika datotek z oblakom ownCloud."
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Prijavno ime"
 
@@ -464,34 +464,40 @@ msgstr "Prijavno ime"
 msgid "Create"
 msgstr "Ustvari"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Privzeta shramba"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Neomejeno"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Drugo"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Shramba"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "spremeni prikazano ime"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "nastavi novo geslo"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Privzeto"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index 068c8cceaea..d3b0448c839 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sl/user_webdavauth.po b/l10n/sl/user_webdavauth.po
index 1d6f802d7e0..8dadab86877 100644
--- a/l10n/sl/user_webdavauth.po
+++ b/l10n/sl/user_webdavauth.po
@@ -9,8 +9,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "WebDAV Authentication"
 msgstr "Overitev WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index 9139b2a0874..a6d044a5505 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -20,27 +20,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "Përdoruesi %s ndau me ju një skedar"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "Përdoruesi %s ndau me ju një dosje"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "Përdoruesi %s ndau me ju skedarin \"%s\". Ky skedar është gati për shkarkim nga këtu: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "Përdoruesi %s ndau me ju dosjen \"%s\". Kjo dosje është gati për shkarkim nga këto: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -393,7 +374,7 @@ msgstr "Azhurnimi dështoi. Ju lutemi njoftoni për këtë problem <a href=\"htt
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "Rivendosja e kodit të ownCloud-it"
 
@@ -421,7 +402,19 @@ msgstr "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kod
 msgid "Username"
 msgstr "Përdoruesi"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Bëj kërkesë për rivendosjen"
 
@@ -469,6 +462,21 @@ msgstr "Ndalohet hyrja"
 msgid "Cloud not found"
 msgstr "Cloud-i nuk u gjet"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "shërbime web nën kontrollin tënd"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Ndrysho kategoritë"
@@ -561,16 +569,12 @@ msgstr "Pozicioni (host) i database-it"
 msgid "Finish setup"
 msgstr "Mbaro setup-in"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "shërbime web nën kontrollin tënd"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Dalje"
 
@@ -604,6 +608,13 @@ msgstr "Hyrje"
 msgid "Alternative Logins"
 msgstr "Hyrje alternative"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "mbrapa"
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index c6170c1d293..ea510307d88 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sq/files_encryption.po b/l10n/sq/files_encryption.po
index bd48080f91f..57fd333cb07 100644
--- a/l10n/sq/files_encryption.po
+++ b/l10n/sq/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/sq/files_external.po b/l10n/sq/files_external.po
index 038722e5bc5..a07082b4588 100644
--- a/l10n/sq/files_external.po
+++ b/l10n/sq/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po
index 426cfabe8e6..4cbb12e8136 100644
--- a/l10n/sq/files_sharing.po
+++ b/l10n/sq/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Shkarko"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Shikimi paraprak nuk është i mundur për"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "shërbime web nën kontrollin tënd"
diff --git a/l10n/sq/files_trashbin.po b/l10n/sq/files_trashbin.po
index 377bc262312..2a95b6477c0 100644
--- a/l10n/sq/files_trashbin.po
+++ b/l10n/sq/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po
index eb1dae68635..023030d0010 100644
--- a/l10n/sq/lib.po
+++ b/l10n/sq/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Ndihmë"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Personale"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Parametra"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Përdoruesit"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "App"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Admin"
 
@@ -113,76 +113,76 @@ msgstr "%s nuk mund të përdorni pikat tek emri i database-it"
 msgid "%s set the database host."
 msgstr "%s caktoni pozicionin (host) e database-it."
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "Përdoruesi dhe/apo kodi i PostgreSQL i pavlefshëm"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Duhet të përdorni një llogari ekzistuese ose llogarinë e administratorit."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "Përdoruesi dhe/apo kodi i MySQL-it i pavlefshëm."
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Veprim i gabuar i DB-it: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Komanda e gabuar ishte: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Përdoruesi MySQL '%s'@'localhost' ekziston."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Eliminoni këtë përdorues nga MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Përdoruesi MySQL '%s'@'%%' ekziston"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Eliminoni këtë përdorues nga MySQL."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Përdoruesi dhe/apo kodi i Oracle-it i pavlefshëm"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Komanda e gabuar ishte: \"%s\", përdoruesi: %s, kodi: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "Përdoruesi dhe/apo kodi i MS SQL i pavlefshëm: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Serveri web i juaji nuk është konfiguruar akoma për të lejuar sinkronizimin e skedarëve sepse ndërfaqja WebDAV mund të jetë e dëmtuar."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>."
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index bf13e0f7469..89fec145fa3 100644
--- a/l10n/sq/settings.po
+++ b/l10n/sq/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\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 ""
 
@@ -136,16 +136,16 @@ msgstr "anulo"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Elimino"
 
@@ -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 "Azhurno"
 
@@ -386,76 +386,76 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Merrni app-et për sinkronizimin e skedarëve tuaj"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Kodi"
 
-#: 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 "Kodi i ri"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "Email-i"
 
-#: 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:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index af6b0ca9c92..d3c5f488249 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sq/user_webdavauth.po b/l10n/sq/user_webdavauth.po
index 2ffc70b6f16..953547cd591 100644
--- a/l10n/sq/user_webdavauth.po
+++ b/l10n/sq/user_webdavauth.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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 4ec1787219f..1ba8aa1cb71 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,26 +19,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "Корисник %s дели са вама датотеку"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "Корисник %s дели са вама директоријум"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "Поништавање лозинке за ownCloud"
 
@@ -420,7 +401,19 @@ msgstr "Добићете везу за ресетовање лозинке пу�
 msgid "Username"
 msgstr "Корисничко име"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Захтевај ресетовање"
 
@@ -468,6 +461,21 @@ msgstr "Забрањен приступ"
 msgid "Cloud not found"
 msgstr "Облак није нађен"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "веб сервиси под контролом"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Измени категорије"
@@ -560,16 +568,12 @@ msgstr "Домаћин базе"
 msgid "Finish setup"
 msgstr "Заврши подешавање"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "веб сервиси под контролом"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Одјава"
 
@@ -603,6 +607,13 @@ msgstr "Пријава"
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "претходно"
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 90ca6a49660..ad4483860e1 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sr/files_encryption.po b/l10n/sr/files_encryption.po
index 1c2c46e27c3..d0b0e9f6405 100644
--- a/l10n/sr/files_encryption.po
+++ b/l10n/sr/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Чување у току..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Шифровање"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/sr/files_external.po b/l10n/sr/files_external.po
index ec3de55ea6f..d63ec04d58c 100644
--- a/l10n/sr/files_external.po
+++ b/l10n/sr/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index 4c64e7cf049..aa017387134 100644
--- a/l10n/sr/files_sharing.po
+++ b/l10n/sr/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Преузми"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "веб сервиси под контролом"
diff --git a/l10n/sr/files_trashbin.po b/l10n/sr/files_trashbin.po
index d456b02c443..0479b2c1c54 100644
--- a/l10n/sr/files_trashbin.po
+++ b/l10n/sr/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
index e35bdd2bc75..466bf88f49c 100644
--- a/l10n/sr/lib.po
+++ b/l10n/sr/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Помоћ"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Лично"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Поставке"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Корисници"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Апликације"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Администратор"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ваш веб сервер тренутно не подржава синхронизацију датотека јер се чини да је WebDAV сучеље неисправно."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Погледајте <a href='%s'>водиче за инсталацију</a>."
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 9e3774b7504..5a79894c070 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\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 "Не могу да уклоним корисника"
 
@@ -136,16 +136,16 @@ msgstr "опозови"
 msgid "Unable to remove user"
 msgstr "Не могу да уклоним корисника"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Групе"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Управник групе"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 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 "Развијају <a href=\"http://ownCloud.org/contact\" target=\"_blank\">Оунклауд (ownCloud) заједница</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворни код</a> је издат под <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Аферо Јавном Лиценцом (Affero General Public License)\">АГПЛ лиценцом</abbr></a>."
 
-#: 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 "Погледајте страницу са програмима на apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-лиценцирао <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Ажурирај"
 
@@ -386,76 +386,76 @@ msgstr "Праћење грешака"
 msgid "Commercial Support"
 msgstr "Комерцијална подршка"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Искористили сте <strong>%s</strong> од дозвољених <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Преузмите апликације ради синхронизовања датотека"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Поново прикажи чаробњак за прво покретање"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Искористили сте <strong>%s</strong> од дозвољених <strong>%s</strong>"
+
+#: 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:81
+#: 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 "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Користите ову адресу да се повежете са ownCloud-ом у управљачу датотекама"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Корисничко име"
 
@@ -463,34 +463,40 @@ msgstr "Корисничко име"
 msgid "Create"
 msgstr "Направи"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Подразумевано складиште"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Неограничено"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Друго"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Складиште"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "промени име за приказ"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "постави нову лозинку"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Подразумевано"
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index 829ed1eb86d..0801cb7969b 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sr/user_webdavauth.po b/l10n/sr/user_webdavauth.po
index 30b3f69adc1..bff29cbe685 100644
--- a/l10n/sr/user_webdavauth.po
+++ b/l10n/sr/user_webdavauth.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Rancher <theranchcowboy@gmail.com>, 2013
+# Rancher <djordje.vasiljevich@gmail.com>, 2013
 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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV провера идентитета"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "Адреса: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index f2c3868a938..2e2b46c4b73 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -19,26 +19,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -420,7 +401,19 @@ msgstr "Dobićete vezu za resetovanje lozinke putem e-pošte."
 msgid "Username"
 msgstr "Korisničko ime"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Zahtevaj resetovanje"
 
@@ -468,6 +461,21 @@ msgstr ""
 msgid "Cloud not found"
 msgstr "Oblak nije nađen"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr ""
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -560,16 +568,12 @@ msgstr "Domaćin baze"
 msgid "Finish setup"
 msgstr "Završi podešavanje"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr ""
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Odjava"
 
@@ -603,6 +607,13 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "prethodno"
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index 372cafb28a0..c63cff5c4fd 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/files_encryption.po b/l10n/sr@latin/files_encryption.po
index b5ee53a5544..e2356b43ef4 100644
--- a/l10n/sr@latin/files_encryption.po
+++ b/l10n/sr@latin/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/sr@latin/files_external.po b/l10n/sr@latin/files_external.po
index 4344f0ca093..fcdd970a751 100644
--- a/l10n/sr@latin/files_external.po
+++ b/l10n/sr@latin/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
index 53bf736d1be..778fd915658 100644
--- a/l10n/sr@latin/files_sharing.po
+++ b/l10n/sr@latin/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Preuzmi"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr ""
diff --git a/l10n/sr@latin/files_trashbin.po b/l10n/sr@latin/files_trashbin.po
index 2b986563c30..08b49fb32b8 100644
--- a/l10n/sr@latin/files_trashbin.po
+++ b/l10n/sr@latin/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po
index 1519240040d..2cdd6e3eb7b 100644
--- a/l10n/sr@latin/lib.po
+++ b/l10n/sr@latin/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Pomoć"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Lično"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Podešavanja"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Korisnici"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Programi"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Adninistracija"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index f1ce782b5ed..98ae0def7e3 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\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 ""
 
@@ -136,16 +136,16 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Grupe"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Obriši"
 
@@ -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 "Izaberite program"
 
-#: 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
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Lozinka"
 
-#: 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 "Ne mogu da izmenim vašu lozinku"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Trenutna lozinka"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nova lozinka"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Izmeni lozinku"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "E-mail"
 
-#: 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 "Jezik"
 
-#: 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:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr "Napravi"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Drugo"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/sr@latin/user_webdavauth.po b/l10n/sr@latin/user_webdavauth.po
index 8a2eb941c19..7c1b403c83b 100644
--- a/l10n/sr@latin/user_webdavauth.po
+++ b/l10n/sr@latin/user_webdavauth.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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 7f3cf1a0a12..3db0482048e 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Gunnar Norin <blittan@xbmc.org>, 2013
+# medialabs, 2013
 # medialabs, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
 "Last-Translator: medialabs\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -20,27 +22,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "Användare %s delade en fil med dig"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "Användare %s delade en mapp med dig"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "Användare %s delade filen \"%s\" med dig. Den finns att ladda ner här: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "Användare %s delade mappen \"%s\" med dig. Den finns att ladda ner här: %s"
+msgid "%s shared »%s« with you"
+msgstr "%s delade »%s« med dig"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -391,9 +374,9 @@ msgstr "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"http
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud"
+msgstr "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "ownCloud lösenordsåterställning"
 
@@ -421,7 +404,19 @@ msgstr "Du får en länk att återställa ditt lösenord via e-post."
 msgid "Username"
 msgstr "Användarnamn"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr "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?"
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "Ja, jag vill verkligen återställa mitt lösenord nu"
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Begär återställning"
 
@@ -469,6 +464,21 @@ msgstr "Åtkomst förbjuden"
 msgid "Cloud not found"
 msgstr "Hittade inget moln"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr "Hej där,⏎\n⏎\nville bara meddela dig att %s delade %s med dig.⏎\nTitta på den: %s⏎\n⏎\nVi hörs!"
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "webbtjänster under din kontroll"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Editera kategorier"
@@ -561,16 +571,12 @@ msgstr "Databasserver"
 msgid "Finish setup"
 msgstr "Avsluta installation"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "webbtjänster under din kontroll"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr "%s är tillgänglig. Få mer information om hur du går tillväga för att uppdatera"
+msgstr "%s är tillgänglig. Få mer information om hur du går tillväga för att uppdatera."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Logga ut"
 
@@ -604,6 +610,13 @@ msgstr "Logga in"
 msgid "Alternative Logins"
 msgstr "Alternativa inloggningar"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr "Hej där,<br><br>ville bara informera dig om att %s delade »%s« med dig.<br><a href=\"%s\">Titta på den!</a><br><br>Hörs!"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "föregående"
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 04d433292d9..a4f40138b45 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Gunnar Norin <blittan@xbmc.org>, 2013
 # medialabs, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: medialabs\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: Gunnar Norin <blittan@xbmc.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -147,7 +148,7 @@ msgstr "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr "Ditt lagringsutrymme är fullt, filer kan ej längre laddas upp eller synkas!"
+msgstr "Ditt lagringsutrymme är fullt, filer kan inte längre uppdateras eller synkroniseras!"
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
diff --git a/l10n/sv/files_encryption.po b/l10n/sv/files_encryption.po
index 556861be597..65010140e99 100644
--- a/l10n/sv/files_encryption.po
+++ b/l10n/sv/files_encryption.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# medialabs <medialabs@gmail.com>, 2013
+# medialabs, 2013
+# medialabs, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-08 02:03+0200\n"
-"PO-Revision-Date: 2013-06-07 09:23+0000\n"
-"Last-Translator: medialabs <medialabs@gmail.com>\n"
+"POT-Creation-Date: 2013-06-16 01:58+0200\n"
+"PO-Revision-Date: 2013-06-15 16:00+0000\n"
+"Last-Translator: medialabs\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,61 +45,118 @@ msgstr "Ändringen av lösenordet lyckades."
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr "Kunde inte ändra lösenordet. Kanske det gamla lösenordet inte var rätt."
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr "Den privata lösenordsnyckeln uppdaterades utan problem."
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr "Kunde inte uppdatera den privata lösenordsnyckeln. Kanske var det gamla lösenordet fel."
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr "Din privata lösenordsnyckel är inte giltig! Kanske byttes ditt lösenord från utsidan. Du kan uppdatera din privata lösenordsnyckel under dina personliga inställningar för att återfå tillgång till dina filer"
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Sparar..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr "Din privata lösenordsnyckel är inte giltig! Kanske byttes ditt lösenord från utsidan."
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr "Du kan låsa upp din privata nyckel i dina"
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr "personliga inställningar"
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr "Aktivera återställningsnyckel för krypterade lösenord. (tillåt delning till återställningsnyckeln):"
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr "Återställning av kontolösenord"
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr "Inaktiverad"
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr "Ändra återställningsnyckeln för krypterade lösenord:"
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr "Gamla lösenordet för återställningskontot"
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr "Nytt återställningslösenord för kontot"
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr "Byt lösenord"
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
-msgstr "Aktivera lösenordsåterställning genom att dela alla filer med din administratör:"
-
 #: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr "Din privata lösenordsnyckel stämmer inte längre överrens med ditt inloggningslösenord:"
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr "Ställ in din gamla privata lösenordsnyckel till ditt aktuella inloggningslösenord."
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr "Om du inte kommer ihåg ditt gamla lösenord kan du be din administratör att återställa dina filer."
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr "Gammalt inloggningslösenord"
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr "Nuvarande inloggningslösenord"
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr "Uppdatera den privata lösenordsnyckeln"
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr "Aktivera lösenordsåterställning"
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
-msgstr "Aktivera det här alternativet för att kunna återfå tillgång till dina krypterade filer om du skulle förlora/glömma ditt lösenord"
+"files in case of password loss"
+msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr "Inställningarna för filåterställning har uppdaterats"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr "Kunde inte uppdatera filåterställning"
diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po
index 8587702e547..487a36a976a 100644
--- a/l10n/sv/files_external.po
+++ b/l10n/sv/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: medialabs\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index beb625bf4df..59b337cad3f 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Ladda ner"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Ingen förhandsgranskning tillgänglig för"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "webbtjänster under din kontroll"
diff --git a/l10n/sv/files_trashbin.po b/l10n/sv/files_trashbin.po
index b51ed96ae70..d5d549eeafb 100644
--- a/l10n/sv/files_trashbin.po
+++ b/l10n/sv/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index 9450f475e13..983cb0aa322 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: medialabs\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Hjälp"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Personligt"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Inställningar"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Användare"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Program"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Admin"
 
@@ -114,76 +114,76 @@ msgstr "%s du får inte använda punkter i databasnamnet"
 msgid "%s set the database host."
 msgstr "%s ange databasserver/host."
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL-användarnamnet och/eller lösenordet är felaktigt"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Du måste antingen ange ett befintligt konto eller administratör."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr "Oracle-anslutning kunde inte etableras"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL-användarnamnet och/eller lösenordet är felaktigt"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB error: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Det felaktiga kommandot var: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL-användaren '%s'@'localhost' existerar redan."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Radera denna användare från MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQl-användare '%s'@'%%' existerar redan"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Radera denna användare från MySQL."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle-användarnamnet och/eller lösenordet är felaktigt"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Det felande kommandot var: \"%s\", name: %s, password: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL-användaren och/eller lösenordet var inte giltigt: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Var god kontrollera <a href='%s'>installationsguiden</a>."
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 4afbd588c29..ac67cf6ce0d 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -3,15 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Gunnar Norin <blittan@xbmc.org>, 2013
+# Jan Busk, 2013
 # Jan Busk, 2013
 # medialabs, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: medialabs\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: Gunnar Norin <blittan@xbmc.org>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,7 +62,7 @@ msgstr "Ogiltig e-post"
 msgid "Unable to delete group"
 msgstr "Kan inte radera grupp"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Kan inte radera användare"
 
@@ -88,7 +90,7 @@ msgstr "Kan inte radera användare från gruppen %s"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr "Kunde inte uppdatera appen"
+msgstr "Kunde inte uppdatera appen."
 
 #: js/apps.js:30
 msgid "Update to {appversion}"
@@ -138,16 +140,16 @@ msgstr "ångra"
 msgid "Unable to remove user"
 msgstr "Kan inte ta bort användare"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Grupper"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Gruppadministratör"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Radera"
 
@@ -326,11 +328,11 @@ msgstr "Mer"
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Version"
 
-#: 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 "
@@ -340,27 +342,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud Community</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Lägg till din applikation"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Fler Appar"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Välj en App"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Se programsida på apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licensierad av <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Uppdatera"
 
@@ -388,76 +390,76 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "Kommersiell support"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Skaffa apparna för att synkronisera dina filer"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Visa Första uppstarts-guiden igen"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Lösenord"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Ditt lösenord har ändrats"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Kunde inte ändra ditt lösenord"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Nuvarande lösenord"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nytt lösenord"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Ändra lösenord"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Visningsnamn"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Din e-postadress"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Fyll i en e-postadress för att aktivera återställning av lösenord"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Språk"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Hjälp att översätta"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Använd denna adress för att ansluta till ownCloud i din filhanterare"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Inloggningsnamn"
 
@@ -465,34 +467,40 @@ msgstr "Inloggningsnamn"
 msgid "Create"
 msgstr "Skapa"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr "Admin återställningslösenord"
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr "Enter the recovery password in order to recover the users files during password change"
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Förvald lagring"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Obegränsad"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Annat"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Lagring"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "ändra visningsnamn"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "ange nytt lösenord"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Förvald"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 0a7eecb95ec..86898105bf7 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: medialabs\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sv/user_webdavauth.po b/l10n/sv/user_webdavauth.po
index ec341c54811..e8848e9ada1 100644
--- a/l10n/sv/user_webdavauth.po
+++ b/l10n/sv/user_webdavauth.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# medialabs, 2013
 # Magnus Höglund <magnus@linux.com>, 2012-2013
 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:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-16 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 10:50+0000\n"
+"Last-Translator: medialabs\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,8 +24,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV Autentisering"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr "URL:"
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po
index ee5e620265e..1fc1e959455 100644
--- a/l10n/sw_KE/core.po
+++ b/l10n/sw_KE/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-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-14 23:59+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -19,26 +19,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -216,23 +197,23 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:138 js/oc-dialogs.js:195
+#: js/oc-dialogs.js:141 js/oc-dialogs.js:200
 msgid "Error loading file picker template"
 msgstr ""
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr ""
 
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -420,7 +401,19 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr ""
 
@@ -468,6 +461,21 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr ""
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -560,16 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr ""
-
-#: templates/layout.user.php:36
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:61
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr ""
 
@@ -603,6 +607,13 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr ""
diff --git a/l10n/sw_KE/files_encryption.po b/l10n/sw_KE/files_encryption.po
index 181a2ef29a7..2eb5754f9b3 100644
--- a/l10n/sw_KE/files_encryption.po
+++ b/l10n/sw_KE/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/sw_KE/files_sharing.po b/l10n/sw_KE/files_sharing.po
index 486d565277c..aa7674bece0 100644
--- a/l10n/sw_KE/files_sharing.po
+++ b/l10n/sw_KE/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-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:47+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr ""
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr ""
diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po
index a8fd5f1a2c2..668dde05ff3 100644
--- a/l10n/sw_KE/settings.po
+++ b/l10n/sw_KE/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-05-25 02:02+0200\n"
-"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"POT-Creation-Date: 2013-06-11 01:57+0200\n"
+"PO-Revision-Date: 2013-06-10 23:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -136,16 +136,16 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr ""
 
@@ -324,11 +324,11 @@ msgstr ""
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -399,7 +399,7 @@ msgstr ""
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:37 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr ""
 
@@ -423,39 +423,39 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:56 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:71
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:96
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/sw_KE/user_webdavauth.po b/l10n/sw_KE/user_webdavauth.po
index b41a7fe5abf..f37c585e1ed 100644
--- a/l10n/sw_KE/user_webdavauth.po
+++ b/l10n/sw_KE/user_webdavauth.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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index 2a246dab005..b6c7984a6f4 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -19,26 +19,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "ownCloud இன் கடவுச்சொல் மீளமைப்பு"
 
@@ -420,7 +401,19 @@ msgstr "நீங்கள் மின்னஞ்சல் மூலம் உ
 msgid "Username"
 msgstr "பயனாளர் பெயர்"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "கோரிக்கை மீளமைப்பு"
 
@@ -468,6 +461,21 @@ msgstr "அணுக தடை"
 msgid "Cloud not found"
 msgstr "Cloud காணப்படவில்லை"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "வகைகளை தொகுக்க"
@@ -560,16 +568,12 @@ msgstr "தரவுத்தள ஓம்புனர்"
 msgid "Finish setup"
 msgstr "அமைப்பை முடிக்க"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "விடுபதிகை செய்க"
 
@@ -603,6 +607,13 @@ msgstr "புகுபதிகை"
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "முந்தைய"
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index 0e19295b90a..eeb4f94e824 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/files_encryption.po b/l10n/ta_LK/files_encryption.po
index 48fb2ff2275..3185af526cc 100644
--- a/l10n/ta_LK/files_encryption.po
+++ b/l10n/ta_LK/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "சேமிக்கப்படுகிறது..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "மறைக்குறியீடு"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ta_LK/files_external.po b/l10n/ta_LK/files_external.po
index 4c6eeba14c9..8b71c9f5eaf 100644
--- a/l10n/ta_LK/files_external.po
+++ b/l10n/ta_LK/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/files_sharing.po b/l10n/ta_LK/files_sharing.po
index 51a80d720c2..9adeae93e1d 100644
--- a/l10n/ta_LK/files_sharing.po
+++ b/l10n/ta_LK/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "பதிவிறக்குக"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "அதற்கு முன்னோக்கு ஒன்றும் இல்லை"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது"
diff --git a/l10n/ta_LK/files_trashbin.po b/l10n/ta_LK/files_trashbin.po
index 3c0a6db8c36..6fbfb622d6d 100644
--- a/l10n/ta_LK/files_trashbin.po
+++ b/l10n/ta_LK/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/lib.po b/l10n/ta_LK/lib.po
index 7c44742f5ed..66f05a39142 100644
--- a/l10n/ta_LK/lib.po
+++ b/l10n/ta_LK/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "உதவி"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "தனிப்பட்ட"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "அமைப்புகள்"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "பயனாளர்"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "செயலிகள்"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "நிர்வாகம்"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index 63e2d32a9fd..1b64ce2d0f6 100644
--- a/l10n/ta_LK/settings.po
+++ b/l10n/ta_LK/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\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 "பயனாளரை நீக்க முடியாது"
 
@@ -136,16 +136,16 @@ msgstr "முன் செயல் நீக்கம் "
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "குழுக்கள்"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "குழு நிர்வாகி"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 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 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: 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 "apps.owncloud.com இல் செயலி பக்கத்தை பார்க்க"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"அனுமதிப்பத்திரம்\"></span>-அனுமதி பெற்ற <span class=\"ஆசிரியர்\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "இற்றைப்படுத்தல்"
 
@@ -386,76 +386,76 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "நீங்கள் <strong>%s</strong> இலுள்ள <strong>%s</strong>பயன்படுத்தியுள்ளீர்கள்"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "நீங்கள் <strong>%s</strong> இலுள்ள <strong>%s</strong>பயன்படுத்தியுள்ளீர்கள்"
+
+#: 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:81
+#: 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:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr "உருவாக்குக"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "மற்றவை"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index 973ddf58fa0..c71e429591e 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/user_webdavauth.po b/l10n/ta_LK/user_webdavauth.po
index fa5d31237c3..143001981c6 100644
--- a/l10n/ta_LK/user_webdavauth.po
+++ b/l10n/ta_LK/user_webdavauth.po
@@ -8,8 +8,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/te/core.po b/l10n/te/core.po
index 5a53b4c76be..3621c0e7bf3 100644
--- a/l10n/te/core.po
+++ b/l10n/te/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -19,26 +19,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -420,7 +401,19 @@ msgstr ""
 msgid "Username"
 msgstr "వాడుకరి పేరు"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr ""
 
@@ -468,6 +461,21 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr ""
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -560,16 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr ""
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "నిష్క్రమించు"
 
@@ -603,6 +607,13 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr ""
diff --git a/l10n/te/files.po b/l10n/te/files.po
index 59ea136f6fc..2d8be8431ef 100644
--- a/l10n/te/files.po
+++ b/l10n/te/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/te/files_encryption.po b/l10n/te/files_encryption.po
index 7ccbc51637f..ee18899a2bd 100644
--- a/l10n/te/files_encryption.po
+++ b/l10n/te/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/te/files_external.po b/l10n/te/files_external.po
index 5516c4ecc0e..d2653046ed1 100644
--- a/l10n/te/files_external.po
+++ b/l10n/te/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/te/files_sharing.po b/l10n/te/files_sharing.po
index 96195fcf7ad..5a1f15a0a63 100644
--- a/l10n/te/files_sharing.po
+++ b/l10n/te/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-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:47+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr ""
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr ""
diff --git a/l10n/te/files_trashbin.po b/l10n/te/files_trashbin.po
index da121991768..b4c9da7af40 100644
--- a/l10n/te/files_trashbin.po
+++ b/l10n/te/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/te/lib.po b/l10n/te/lib.po
index 7d35cbe2cc4..f6a30e2acd0 100644
--- a/l10n/te/lib.po
+++ b/l10n/te/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 00:02+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "సహాయం"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr ""
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "అమరికలు"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "వాడుకరులు"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr ""
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr ""
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/te/settings.po b/l10n/te/settings.po
index c744b0e704f..d8075f6d8d2 100644
--- a/l10n/te/settings.po
+++ b/l10n/te/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\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 ""
 
@@ -136,16 +136,16 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 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
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: 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:81
+#: 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:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po
index a1d13612a9e..457e1ebe6bb 100644
--- a/l10n/te/user_ldap.po
+++ b/l10n/te/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/te/user_webdavauth.po b/l10n/te/user_webdavauth.po
index dac5225d964..e586de734dd 100644
--- a/l10n/te/user_webdavauth.po
+++ b/l10n/te/user_webdavauth.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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 28e960f7fa9..e1d617e4b97 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,37 +8,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -420,7 +401,19 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr ""
 
@@ -468,6 +461,21 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr ""
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -560,16 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr ""
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr ""
 
@@ -603,6 +607,13 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index b659be23a1a..bb1623fc74e 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 41a5e9e058c..876013105c8 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -42,61 +42,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 04085c3a1df..d45e8a76d09 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 80fd28d0675..0e39f821ef3 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -42,7 +42,3 @@ msgstr ""
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr ""
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index ab030823c20..cdef6df66dd 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index f7d313ecf62..baa9aa99c2a 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 19f98f50879..630449d254c 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr ""
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr ""
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr ""
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr ""
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr ""
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr ""
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index a359a70931e..e01592e5069 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 ""
 
@@ -136,16 +136,16 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 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 href=\"https://github.com/owncloud\" "
@@ -337,28 +337,28 @@ msgid ""
 "General Public 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
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: 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:81
+#: 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:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 5755355a9a2..b09d97e687b 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 003aa61119a..965793af7a5 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index 9160ef6f8f0..247f3f4906b 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "ผู้ใช้งาน %s ได้แชร์ไฟล์ให้กับคุณ"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "ผู้ใช้งาน %s ได้แชร์โฟลเดอร์ให้กับคุณ"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "ผู้ใช้งาน %s ได้แชร์ไฟล์ \"%s\" ให้กับคุณ และคุณสามารถสามารถดาวน์โหลดไฟล์ดังกล่าวได้จากที่นี่: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "ผู้ใช้งาน %s ได้แชร์โฟลเดอร์ \"%s\" ให้กับคุณ และคุณสามารถดาวน์โหลดโฟลเดอร์ดังกล่าวได้จากที่นี่: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -392,7 +373,7 @@ msgstr "การอัพเดทไม่เป็นผลสำเร็จ
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้"
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "รีเซ็ตรหัสผ่าน ownCloud"
 
@@ -420,7 +401,19 @@ msgstr "คุณจะได้รับลิงค์เพื่อกำห
 msgid "Username"
 msgstr "ชื่อผู้ใช้งาน"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "ขอเปลี่ยนรหัสใหม่"
 
@@ -468,6 +461,21 @@ msgstr "การเข้าถึงถูกหวงห้าม"
 msgid "Cloud not found"
 msgstr "ไม่พบ Cloud"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "แก้ไขหมวดหมู่"
@@ -560,16 +568,12 @@ msgstr "Database host"
 msgid "Finish setup"
 msgstr "ติดตั้งเรียบร้อยแล้ว"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "ออกจากระบบ"
 
@@ -603,6 +607,13 @@ msgstr "เข้าสู่ระบบ"
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "ก่อนหน้า"
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 499ac8d86ba..caf6ea0b390 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/files_encryption.po b/l10n/th_TH/files_encryption.po
index c52fe69a4c4..2b764c9d97d 100644
--- a/l10n/th_TH/files_encryption.po
+++ b/l10n/th_TH/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "กำลังบันทึกข้อมูล..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "การเข้ารหัส"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/th_TH/files_external.po b/l10n/th_TH/files_external.po
index 1e76ec514cb..64c93b4223a 100644
--- a/l10n/th_TH/files_external.po
+++ b/l10n/th_TH/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index f2d3d62bbaa..bdabc112bf1 100644
--- a/l10n/th_TH/files_sharing.po
+++ b/l10n/th_TH/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "ดาวน์โหลด"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "ไม่สามารถดูตัวอย่างได้สำหรับ"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้"
diff --git a/l10n/th_TH/files_trashbin.po b/l10n/th_TH/files_trashbin.po
index 04c3dfb2f0e..d0d5f74b5ec 100644
--- a/l10n/th_TH/files_trashbin.po
+++ b/l10n/th_TH/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index 10e0ed55934..b2ff943d402 100644
--- a/l10n/th_TH/lib.po
+++ b/l10n/th_TH/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "ช่วยเหลือ"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "ส่วนตัว"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "ตั้งค่า"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "ผู้ใช้งาน"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "แอปฯ"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "ผู้ดูแล"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 88f5faaa8c4..45adad44313 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\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 "ไม่สามารถลบผู้ใช้งานได้"
 
@@ -136,16 +136,16 @@ msgstr "เลิกทำ"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "กลุ่ม"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "ผู้ดูแลกลุ่ม"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 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 "พัฒนาโดย the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ชุมชนผู้ใช้งาน ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">ซอร์สโค้ด</a>อยู่ภายใต้สัญญาอนุญาตของ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: 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 "เลือก App"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "ดูหน้าแอพพลิเคชั่นที่ apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-ลิขสิทธิ์การใช้งานโดย <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "อัพเดท"
 
@@ -386,76 +386,76 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "บริการลูกค้าแบบเสียค่าใช้จ่าย"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "คุณได้ใช้งานไปแล้ว <strong>%s</strong> จากจำนวนที่สามารถใช้ได้ <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "แสดงหน้าจอวิซาร์ดนำทางครั้งแรกอีกครั้ง"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "คุณได้ใช้งานไปแล้ว <strong>%s</strong> จากจำนวนที่สามารถใช้ได้ <strong>%s</strong>"
+
+#: 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:81
+#: 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 "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "ใช้ที่อยู่นี้เพื่อเชื่อมต่อกับ ownCloud ในโปรแกรมจัดการไฟล์ของคุณ"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "ชื่อที่ใช้สำหรับเข้าสู่ระบบ"
 
@@ -463,34 +463,40 @@ msgstr "ชื่อที่ใช้สำหรับเข้าสู่ร
 msgid "Create"
 msgstr "สร้าง"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "พื้นที่จำกัดข้อมูลเริ่มต้น"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "ไม่จำกัดจำนวน"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "อื่นๆ"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "พื้นที่จัดเก็บข้อมูล"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "เปลี่ยนชื่อที่ต้องการให้แสดง"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "ตั้งค่ารหัสผ่านใหม่"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "ค่าเริ่มต้น"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index 84d0a03ade4..c0b46a90d0a 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/th_TH/user_webdavauth.po b/l10n/th_TH/user_webdavauth.po
index af83ef0d006..08cda589473 100644
--- a/l10n/th_TH/user_webdavauth.po
+++ b/l10n/th_TH/user_webdavauth.po
@@ -8,8 +8,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -23,8 +23,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV Authentication"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 4d902877553..00b3a6fdd0e 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
-"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,27 +20,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "%s kullanıcısı sizinle bir dosyayı paylaştı"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "%s kullanıcısı sizinle bir dizini paylaştı"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "%s kullanıcısı \"%s\" dosyasını sizinle paylaştı. %s adresinden indirilebilir"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "%s kullanıcısı \"%s\" dizinini sizinle paylaştı. %s adresinden indirilebilir"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -393,7 +374,7 @@ msgstr "Güncelleme başarılı olmadı. Lütfen bu hatayı bildirin <a href=\"h
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Güncelleme başarılı. ownCloud'a yönlendiriliyor."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "ownCloud parola sıfırlama"
 
@@ -421,7 +402,19 @@ msgstr "Parolanızı sıfırlamak için bir bağlantı Eposta olarak gönderilec
 msgid "Username"
 msgstr "Kullanıcı Adı"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Sıfırlama iste"
 
@@ -469,6 +462,21 @@ msgstr "Erişim yasaklı"
 msgid "Cloud not found"
 msgstr "Bulut bulunamadı"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "Bilgileriniz güvenli ve şifreli"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Kategorileri düzenle"
@@ -561,16 +569,12 @@ msgstr "Veritabanı sunucusu"
 msgid "Finish setup"
 msgstr "Kurulumu tamamla"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "Bilgileriniz güvenli ve şifreli"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s mevcuttur. Güncelleştirme hakkında daha fazla bilgi alın."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Çıkış yap"
 
@@ -604,6 +608,13 @@ msgstr "Giriş yap"
 msgid "Alternative Logins"
 msgstr "Alternatif Girişler"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "önceki"
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index f4c759bb895..e861719cc29 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po
index 06db70b18da..e6a73fd95a0 100644
--- a/l10n/tr/files_encryption.po
+++ b/l10n/tr/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-08 02:03+0200\n"
-"PO-Revision-Date: 2013-06-07 09:23+0000\n"
-"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,61 +44,118 @@ msgstr "Şifreniz başarıyla değiştirildi."
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr "Parola değiştirilemedi. Eski parolanız doğru olmayabilir"
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Kaydediliyor..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Şifreleme"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr "Şifreli parola kurtarma anahtarını etkinleştir(kurtarma anahtarı paylaşımına izin ver)"
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr "Kurtarma hesabı parolası"
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr "Etkinleştirildi"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr "Devre dışı"
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr "Şifreli parolalar kurtarma anahtarını değiştir:"
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr "Eski kurtarma hesabı parolası"
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr "Yeni kurtarma hesabı parolası"
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr "Parola değiştir"
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
-msgstr "Parola kurtarmasını tüm paylaşılan dosyaları sistem yöneticiniz ile paylaşarak kurtarmayı etkinleştir:"
-
 #: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
-msgstr "Bu seçeneği etkinleştirmekle eğer parolanızı kaybederseniz şifreli dosyalara erişimi elde etmiş olursunuz"
+"files in case of password loss"
+msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr "Dosya kurtarma ayarları güncellendi"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr "Dosya kurtarma güncellenemedi"
diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po
index 30864d070ef..701dcb2efcf 100644
--- a/l10n/tr/files_external.po
+++ b/l10n/tr/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index f33f1214734..959c5e04308 100644
--- a/l10n/tr/files_sharing.po
+++ b/l10n/tr/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "İndir"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Kullanılabilir önizleme yok"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "Bilgileriniz güvenli ve şifreli"
diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po
index d994fdc9126..c13957b9986 100644
--- a/l10n/tr/files_trashbin.po
+++ b/l10n/tr/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index 19a72a91870..0588ebd182b 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Yardım"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Kişisel"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Kullanıcılar"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Uygulamalar"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Yönetici"
 
@@ -114,76 +114,76 @@ msgstr "%s veritabanı adında nokta kullanamayabilirsiniz"
 msgid "%s set the database host."
 msgstr "%s veritabanı sunucu adını tanımla"
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL adi kullanici ve/veya parola yasal degildir. "
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Bir konto veya kullanici birlemek ihtiyacin. "
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr "Oracle bağlantısı kurulamadı"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL kullanıcı adı ve/veya parolası geçerli değil"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "DB Hata: ''%s''"
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Komut rahasiz ''%s''. "
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL kullanici '%s @local host zatan var. "
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Bu kullanici MySQLden list disari koymak. "
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL kullanici '%s @ % % zaten var (zaten yazili)"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Bu kulanıcıyı MySQL veritabanından kaldır"
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Adi klullanici ve/veya parola Oracle mantikli değildir. "
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Hatalı komut: \"%s\", ad: %s, parola: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL kullanıcı adı ve/veya parolası geçersiz: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırılmamış. WevDAV arabirimini sorunlu gözüküyor."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Lütfen <a href='%s'>kurulum kılavuzlarını</a> iki kez kontrol edin."
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index e3c3da11396..f723b52d59b 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,7 +59,7 @@ msgstr "Geçersiz eposta"
 msgid "Unable to delete group"
 msgstr "Grup silinemiyor"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Kullanıcı silinemiyor"
 
@@ -137,16 +137,16 @@ msgstr "geri al"
 msgid "Unable to remove user"
 msgstr "Kullanıcı kaldırılamıyor"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Gruplar"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Yönetici Grubu "
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Sil"
 
@@ -325,11 +325,11 @@ msgstr "Daha fazla"
 msgid "Less"
 msgstr "Az"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Sürüm"
 
-#: 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 "
@@ -339,27 +339,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Geliştirilen Taraf<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is altında lisanslanmıştır <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Uygulamanı Ekle"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Daha fazla uygulama"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Bir uygulama seçin"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Uygulamanın sayfasına apps.owncloud.com adresinden bakın "
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lisanslayan <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Güncelleme"
 
@@ -387,76 +387,76 @@ msgstr "Hata Takip Sistemi"
 msgid "Commercial Support"
 msgstr "Ticari Destek"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Kullandığınız:<strong>%s</strong> seçilebilecekler: <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Dosyalarınızı senkronize etmek için uygulamayı indirin"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "İlk Çalıştırma Sihirbazını yeniden göster"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Kullandığınız:<strong>%s</strong> seçilebilecekler: <strong>%s</strong>"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Parola"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Şifreniz değiştirildi"
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Parolanız değiştirilemiyor"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Mevcut parola"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Yeni parola"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Parola değiştir"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Ekran Adı"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "Eposta"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Eposta adresiniz"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Parola kurtarmayı etkinleştirmek için bir eposta adresi girin"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Dil"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Çevirilere yardım edin"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Bu adresi kullanarak ownCloud 'unuza dosya yöneticinizde bağlanın"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Giriş Adı"
 
@@ -464,34 +464,40 @@ msgstr "Giriş Adı"
 msgid "Create"
 msgstr "Oluştur"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr "Yönetici kurtarma parolası"
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Varsayılan Depolama"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Limitsiz"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Diğer"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Depolama"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "ekran adını değiştir"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "yeni parola belirle"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Varsayılan"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index 84fe2a4a5ac..ba83a78f525 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/tr/user_webdavauth.po b/l10n/tr/user_webdavauth.po
index 03ee4902c8e..5e69022bb6e 100644
--- a/l10n/tr/user_webdavauth.po
+++ b/l10n/tr/user_webdavauth.po
@@ -11,9 +11,9 @@ 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:26+0000\n"
-"Last-Translator: KAT.RAT12 <spanish.katerina@gmail.com>\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,8 +26,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV Kimlik doğrulaması"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/ug/core.po b/l10n/ug/core.po
index 300b68ef358..5804dbcf263 100644
--- a/l10n/ug/core.po
+++ b/l10n/ug/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
-"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,26 +19,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -420,7 +401,19 @@ msgstr ""
 msgid "Username"
 msgstr "ئىشلەتكۈچى ئاتى"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr ""
 
@@ -468,6 +461,21 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr ""
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -560,16 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr "تەڭشەك تامام"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr ""
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "تىزىمدىن چىق"
 
@@ -603,6 +607,13 @@ msgstr ""
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr ""
diff --git a/l10n/ug/files.po b/l10n/ug/files.po
index fb86e4c5222..6c8add22bd3 100644
--- a/l10n/ug/files.po
+++ b/l10n/ug/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ug/files_encryption.po b/l10n/ug/files_encryption.po
index e3519652c88..326a70f4778 100644
--- a/l10n/ug/files_encryption.po
+++ b/l10n/ug/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "ساقلاۋاتىدۇ…"
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "شىفىرلاش"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ug/files_external.po b/l10n/ug/files_external.po
index a0a3d3e2f8e..ca1b6f18316 100644
--- a/l10n/ug/files_external.po
+++ b/l10n/ug/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ug/files_sharing.po b/l10n/ug/files_sharing.po
index a740a72d4b2..5ade987b237 100644
--- a/l10n/ug/files_sharing.po
+++ b/l10n/ug/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: uqkun <uqkun@outlook.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +43,3 @@ msgstr "چۈشۈر"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr ""
diff --git a/l10n/ug/files_trashbin.po b/l10n/ug/files_trashbin.po
index f1f09886a2c..608253e15e8 100644
--- a/l10n/ug/files_trashbin.po
+++ b/l10n/ug/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ug/lib.po b/l10n/ug/lib.po
index 77ebdca63c6..86118a06f28 100644
--- a/l10n/ug/lib.po
+++ b/l10n/ug/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "ياردەم"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "شەخسىي"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "تەڭشەكلەر"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "ئىشلەتكۈچىلەر"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "ئەپلەر"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr ""
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po
index 85010e1d229..e758df121ec 100644
--- a/l10n/ug/settings.po
+++ b/l10n/ug/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\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 "ئىشلەتكۈچىنى ئۆچۈرەلمىدى"
 
@@ -136,16 +136,16 @@ msgstr "يېنىۋال"
 msgid "Unable to remove user"
 msgstr "ئىشلەتكۈچىنى چىقىرىۋېتەلمەيدۇ"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "گۇرۇپپا"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "گۇرۇپپا باشقۇرغۇچى"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 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
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: 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:81
+#: 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 "WebDAV"
 
-#: 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:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "تىزىمغا كىرىش ئاتى"
 
@@ -463,34 +463,40 @@ msgstr "تىزىمغا كىرىش ئاتى"
 msgid "Create"
 msgstr "قۇر"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "كۆڭۈلدىكى ساقلىغۇچ"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "چەكسىز"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "باشقا"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "ساقلىغۇچ"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "كۆرسىتىدىغان ئىسىمنى ئۆزگەرت"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "يېڭى ئىم تەڭشە"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "كۆڭۈلدىكى"
diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po
index 1497b82e854..c3caa24cb29 100644
--- a/l10n/ug/user_ldap.po
+++ b/l10n/ug/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ug/user_webdavauth.po b/l10n/ug/user_webdavauth.po
index 544a8b946ed..ebca1d6ca9b 100644
--- a/l10n/ug/user_webdavauth.po
+++ b/l10n/ug/user_webdavauth.po
@@ -8,9 +8,9 @@ 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:26+0000\n"
-"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,8 +23,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV سالاھىيەت دەلىللەش"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index b8ab0535294..775080772d8 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -19,27 +19,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "Користувач %s поділився файлом з вами"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "Користувач %s поділився текою з вами"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "Користувач %s поділився файлом \"%s\" з вами. Він доступний для завантаження звідси: %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "Користувач %s поділився текою \"%s\" з вами. Він доступний для завантаження звідси: %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -392,7 +373,7 @@ msgstr "Оновлення виконалось неуспішно. Будь л�
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Оновлення виконалось успішно. Перенаправляємо вас на  ownCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "скидання пароля ownCloud"
 
@@ -420,7 +401,19 @@ msgstr "Ви отримаєте посилання для скидання ва�
 msgid "Username"
 msgstr "Ім'я користувача"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Запит скидання"
 
@@ -468,6 +461,21 @@ msgstr "Доступ заборонено"
 msgid "Cloud not found"
 msgstr "Cloud не знайдено"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "підконтрольні Вам веб-сервіси"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Редагувати категорії"
@@ -560,16 +568,12 @@ msgstr "Хост бази даних"
 msgid "Finish setup"
 msgstr "Завершити налаштування"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "підконтрольні Вам веб-сервіси"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Вихід"
 
@@ -603,6 +607,13 @@ msgstr "Вхід"
 msgid "Alternative Logins"
 msgstr "Альтернативні Логіни"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "попередній"
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 5cfc465cfb1..9765c74af52 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po
index ea28d0078fa..8ea782c7d5b 100644
--- a/l10n/uk/files_encryption.po
+++ b/l10n/uk/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Зберігаю..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Шифрування"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/uk/files_external.po b/l10n/uk/files_external.po
index 0e783376e1f..09deb2b9db6 100644
--- a/l10n/uk/files_external.po
+++ b/l10n/uk/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
index cdb719b60b3..43228521ca5 100644
--- a/l10n/uk/files_sharing.po
+++ b/l10n/uk/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Завантажити"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Попередній перегляд недоступний для"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "підконтрольні Вам веб-сервіси"
diff --git a/l10n/uk/files_trashbin.po b/l10n/uk/files_trashbin.po
index e9bea37a86c..3e9eb69e8b6 100644
--- a/l10n/uk/files_trashbin.po
+++ b/l10n/uk/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index 0307e014a4a..a9a396413b8 100644
--- a/l10n/uk/lib.po
+++ b/l10n/uk/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Допомога"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Особисте"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Налаштування"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Користувачі"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Додатки"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Адмін"
 
@@ -113,76 +113,76 @@ msgstr "%s не можна використовувати крапки в наз
 msgid "%s set the database host."
 msgstr "%s встановити хост бази даних."
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL ім'я користувача та/або пароль не дійсні"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "Вам потрібно ввести або існуючий обліковий запис або administrator."
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL ім'я користувача та/або пароль не дійсні"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "Помилка БД: \"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "Команда, що викликала проблему: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "Користувач MySQL '%s'@'localhost' вже існує."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "Видалити цього користувача з MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "Користувач MySQL '%s'@'%%' вже існує"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "Видалити цього користувача з MySQL."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle ім'я користувача та/або пароль не дійсні"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Команда, що викликала проблему: \"%s\", ім'я: %s, пароль: %s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL ім'я користувача та/або пароль не дійсні: %s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>."
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 6a0edb56e8b..e4db481755a 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\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 "Не вдалося видалити користувача"
 
@@ -136,16 +136,16 @@ msgstr "відмінити"
 msgid "Unable to remove user"
 msgstr "Неможливо видалити користувача"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Групи"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Адміністратор групи"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 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 "Розроблено <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud громадою</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">вихідний код</a> має ліцензію <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: 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 "Перегляньте сторінку програм на apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Оновити"
 
@@ -386,76 +386,76 @@ msgstr "БагТрекер"
 msgid "Commercial Support"
 msgstr "Комерційна підтримка"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Ви використали <strong>%s</strong> із доступних <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Отримати додатки для синхронізації ваших файлів"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Показувати Майстер Налаштувань знову"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Ви використали <strong>%s</strong> із доступних <strong>%s</strong>"
+
+#: 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:81
+#: 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 "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Використовуйте цю адресу для під'єднання до вашого ownCloud у вашому файловому менеджері"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Ім'я Логіну"
 
@@ -463,34 +463,40 @@ msgstr "Ім'я Логіну"
 msgid "Create"
 msgstr "Створити"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "сховище за замовчуванням"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Необмежено"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Інше"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Сховище"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "змінити зображене ім'я"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "встановити новий пароль"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "За замовчуванням"
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index bbff9e10921..354c745f3b4 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/uk/user_webdavauth.po b/l10n/uk/user_webdavauth.po
index feb00291cb7..36cc099000a 100644
--- a/l10n/uk/user_webdavauth.po
+++ b/l10n/uk/user_webdavauth.po
@@ -10,8 +10,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -25,8 +25,8 @@ msgid "WebDAV Authentication"
 msgstr "Аутентифікація WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index 6562d96b9e4..e546158a01c 100644
--- a/l10n/ur_PK/core.po
+++ b/l10n/ur_PK/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -19,26 +19,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "اون کلاؤڈ پاسورڈ ری سیٹ"
 
@@ -420,7 +401,19 @@ msgstr "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا
 msgid "Username"
 msgstr "یوزر نیم"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "ری سیٹ کی درخواست کریں"
 
@@ -468,6 +461,21 @@ msgstr "پہنچ کی اجازت نہیں"
 msgid "Cloud not found"
 msgstr "نہیں مل سکا"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "آپ کے اختیار میں ویب سروسیز"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "زمرہ جات کی تدوین کریں"
@@ -560,16 +568,12 @@ msgstr "ڈیٹابیس ہوسٹ"
 msgid "Finish setup"
 msgstr "سیٹ اپ ختم کریں"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "آپ کے اختیار میں ویب سروسیز"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "لاگ آؤٹ"
 
@@ -603,6 +607,13 @@ msgstr "لاگ ان"
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "پچھلا"
diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po
index 669488a7cae..c945d218cea 100644
--- a/l10n/ur_PK/files.po
+++ b/l10n/ur_PK/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/files_encryption.po b/l10n/ur_PK/files_encryption.po
index 7db2a58d18a..b002ce15244 100644
--- a/l10n/ur_PK/files_encryption.po
+++ b/l10n/ur_PK/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/ur_PK/files_sharing.po b/l10n/ur_PK/files_sharing.po
index a094fe6a21a..65623d2348b 100644
--- a/l10n/ur_PK/files_sharing.po
+++ b/l10n/ur_PK/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-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:47+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr ""
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "آپ کے اختیار میں ویب سروسیز"
diff --git a/l10n/ur_PK/files_trashbin.po b/l10n/ur_PK/files_trashbin.po
index 1db5a25f470..6fe896a1c3c 100644
--- a/l10n/ur_PK/files_trashbin.po
+++ b/l10n/ur_PK/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/lib.po b/l10n/ur_PK/lib.po
index 42b90916ae8..fe1ddaf99cd 100644
--- a/l10n/ur_PK/lib.po
+++ b/l10n/ur_PK/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 00:02+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 00:04+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: ur_PK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "مدد"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "ذاتی"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "سیٹینگز"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "یوزرز"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "ایپز"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "ایڈمن"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po
index 2e794bb41d2..7120aba682f 100644
--- a/l10n/ur_PK/settings.po
+++ b/l10n/ur_PK/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\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 ""
 
@@ -136,16 +136,16 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 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
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: 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:81
+#: 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:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
index 2b1ded2759b..8507331d911 100644
--- a/l10n/ur_PK/user_ldap.po
+++ b/l10n/ur_PK/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ur_PK/user_webdavauth.po b/l10n/ur_PK/user_webdavauth.po
index 3082e6561fc..d401530efb3 100644
--- a/l10n/ur_PK/user_webdavauth.po
+++ b/l10n/ur_PK/user_webdavauth.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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index 329fef9c31b..ae6f6756118 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
-"Last-Translator: xtdv <truong.tx8@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,27 +20,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "%s chia sẻ tập tin này cho bạn"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "%s chia sẻ thư mục này cho bạn"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "Người dùng %s chia sẻ tập tin \"%s\" cho bạn .Bạn có thể tải tại đây : %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "Người dùng %s chia sẻ thư mục \"%s\" cho bạn .Bạn có thể tải tại đây : %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -393,7 +374,7 @@ msgstr "Cập nhật không thành công . Vui lòng thông báo đến <a href=
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "Khôi phục mật khẩu Owncloud "
 
@@ -421,7 +402,19 @@ msgstr "Vui lòng kiểm tra Email để khôi phục lại mật khẩu."
 msgid "Username"
 msgstr "Tên đăng nhập"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "Yêu cầu thiết lập lại "
 
@@ -469,6 +462,21 @@ msgstr "Truy cập bị cấm"
 msgid "Cloud not found"
 msgstr "Không tìm thấy Clound"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "dịch vụ web dưới sự kiểm soát của bạn"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "Sửa chuyên mục"
@@ -561,16 +569,12 @@ msgstr "Database host"
 msgid "Finish setup"
 msgstr "Cài đặt hoàn tất"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "dịch vụ web dưới sự kiểm soát của bạn"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s còn trống. Xem thêm thông tin cách cập nhật."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Đăng xuất"
 
@@ -604,6 +608,13 @@ msgstr "Đăng nhập"
 msgid "Alternative Logins"
 msgstr "Đăng nhập khác"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "Lùi lại"
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index 0baeb3a4aee..d080cffa125 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/vi/files_encryption.po b/l10n/vi/files_encryption.po
index 377cc879b67..84588ba7ac5 100644
--- a/l10n/vi/files_encryption.po
+++ b/l10n/vi/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-08 02:03+0200\n"
-"PO-Revision-Date: 2013-06-07 09:23+0000\n"
-"Last-Translator: Tuấn Kiệt Hồ <hotuankiet_2000@yahoo.com>\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,61 +44,118 @@ msgstr "Đã đổi mật khẩu."
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr "Không thể đổi mật khẩu. Có lẽ do mật khẩu cũ không đúng."
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Đang lưu..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "Mã hóa"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr "Mật khẩu cho tài khoản cứu hộ"
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr "Bật"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr "Tắt"
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr "Đổi Mật khẩu"
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/vi/files_external.po b/l10n/vi/files_external.po
index 31b55a8840a..7211ba53a35 100644
--- a/l10n/vi/files_external.po
+++ b/l10n/vi/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: xtdv <truong.tx8@gmail.com>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index 753cf42762c..ab0ba85246d 100644
--- a/l10n/vi/files_sharing.po
+++ b/l10n/vi/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "Tải về"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "Không có xem trước cho"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "dịch vụ web dưới sự kiểm soát của bạn"
diff --git a/l10n/vi/files_trashbin.po b/l10n/vi/files_trashbin.po
index e649fd5fc7e..b5e445cf4b9 100644
--- a/l10n/vi/files_trashbin.po
+++ b/l10n/vi/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
index 7961f29a29e..7b4b17070ab 100644
--- a/l10n/vi/lib.po
+++ b/l10n/vi/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "Giúp đỡ"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "Cá nhân"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "Cài đặt"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "Người dùng"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "Ứng dụng"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "Quản trị"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 19c02048eb1..1855f1e4702 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr "Email không hợp lệ"
 msgid "Unable to delete group"
 msgstr "Không thể xóa nhóm"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "Không thể xóa người dùng"
 
@@ -136,16 +136,16 @@ msgstr "lùi lại"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "Nhóm"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "Nhóm quản trị"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "Xóa"
 
@@ -324,11 +324,11 @@ msgstr "hơn"
 msgid "Less"
 msgstr "ít"
 
-#: templates/admin.php:235 templates/personal.php:111
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr "Phiên bản"
 
-#: 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 "Được phát triển bởi <a href=\"http://ownCloud.org/contact\" target=\"_blank\">cộng đồng ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">mã nguồn </a> đã được cấp phép theo chuẩn <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "Thêm ứng dụng của bạn"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "Nhiều ứng dụng hơn"
 
-#: templates/apps.php:28
+#: templates/apps.php:33
 msgid "Select an App"
 msgstr "Chọn một ứng dụng"
 
-#: templates/apps.php:34
+#: templates/apps.php:39
 msgid "See application page at apps.owncloud.com"
 msgstr "Xem nhiều ứng dụng hơn tại apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-Giấy phép được cấp bởi  <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "Cập nhật"
 
@@ -386,76 +386,76 @@ msgstr "Hệ ghi nhận lỗi"
 msgid "Commercial Support"
 msgstr "Hỗ trợ có phí"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Bạn đã sử dụng <strong>%s </ strong> có sẵn <strong> %s </ strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "Nhận ứng dụng để đồng bộ file của bạn"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "Hiện lại việc chạy đồ thuật khởi đầu"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "Bạn đã sử dụng <strong>%s </ strong> có sẵn <strong> %s </ strong>"
+
+#: templates/personal.php:40 templates/users.php:23 templates/users.php:86
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr "Mật khẩu của bạn đã được thay đổi."
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr "Không thể đổi mật khẩu"
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Mật khẩu cũ"
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Mật khẩu mới"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr "Đổi mật khẩu"
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr "Tên hiển thị"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:73
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr "Email của bạn"
 
-#: templates/personal.php:74
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr "Nhập địa chỉ email của bạn để khôi phục lại mật khẩu"
 
-#: templates/personal.php:83 templates/personal.php:84
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr "Ngôn ngữ"
 
-#: templates/personal.php:95
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr "Hỗ trợ dịch thuật"
 
-#: templates/personal.php:100
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Sử dụng địa chỉ này để kết nối ownCloud của bạn trong trình quản lý file của bạn"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "Tên đăng nhập"
 
@@ -463,34 +463,40 @@ msgstr "Tên đăng nhập"
 msgid "Create"
 msgstr "Tạo"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "Bộ nhớ mặc định"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "Không giới hạn"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "Khác"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Bộ nhớ"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "Thay đổi tên hiển thị"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "đặt mật khẩu mới"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Mặc định"
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index d9dc91a72cf..10c3ef2f868 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/vi/user_webdavauth.po b/l10n/vi/user_webdavauth.po
index e3cb6494d12..bbcb7346fe5 100644
--- a/l10n/vi/user_webdavauth.po
+++ b/l10n/vi/user_webdavauth.po
@@ -9,8 +9,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -24,8 +24,8 @@ msgid "WebDAV Authentication"
 msgstr "Xác thực WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index e6249054f71..26ca2db0ba0 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
-"Last-Translator: hyy0591 <yangyu.huang@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,27 +21,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "用户 %s 与您分享了一个文件"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "用户 %s 与您分享了一个文件夹"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "用户 %s 与您分享了文件“%s”。点击下载：%s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "用户 %s 与您分享了文件夹“%s”。点击下载：%s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -394,7 +375,7 @@ msgstr "升级失败。请向<a href=\"https://github.com/owncloud/core/issues\"
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "升级成功。现在为您跳转到ownCloud。"
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "私有云密码重置"
 
@@ -422,7 +403,19 @@ msgstr "你将会收到一个重置密码的链接"
 msgid "Username"
 msgstr "用户名"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "要求重置"
 
@@ -470,6 +463,21 @@ msgstr "禁止访问"
 msgid "Cloud not found"
 msgstr "云 没有被找到"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "您控制的网络服务"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "编辑分类"
@@ -562,16 +570,12 @@ msgstr "数据库主机"
 msgid "Finish setup"
 msgstr "完成安装"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "您控制的网络服务"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "注销"
 
@@ -605,6 +609,13 @@ msgstr "登陆"
 msgid "Alternative Logins"
 msgstr "备选登录"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "后退"
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index 6267d8dc2f0..458b3312482 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/files_encryption.po b/l10n/zh_CN.GB2312/files_encryption.po
index d98fa3d78b4..a6c9670803c 100644
--- a/l10n/zh_CN.GB2312/files_encryption.po
+++ b/l10n/zh_CN.GB2312/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "保存中..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "加密"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/zh_CN.GB2312/files_external.po b/l10n/zh_CN.GB2312/files_external.po
index 4e2b2c83f21..912858329fa 100644
--- a/l10n/zh_CN.GB2312/files_external.po
+++ b/l10n/zh_CN.GB2312/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: hyy0591 <yangyu.huang@gmail.com>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/files_sharing.po b/l10n/zh_CN.GB2312/files_sharing.po
index f99b3c76a31..9721a806943 100644
--- a/l10n/zh_CN.GB2312/files_sharing.po
+++ b/l10n/zh_CN.GB2312/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "下载"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "没有预览可用于"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "您控制的网络服务"
diff --git a/l10n/zh_CN.GB2312/files_trashbin.po b/l10n/zh_CN.GB2312/files_trashbin.po
index d132bb82935..8c66f848dd1 100644
--- a/l10n/zh_CN.GB2312/files_trashbin.po
+++ b/l10n/zh_CN.GB2312/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/lib.po b/l10n/zh_CN.GB2312/lib.po
index 5c07ebbb2cf..b46b81ded6a 100644
--- a/l10n/zh_CN.GB2312/lib.po
+++ b/l10n/zh_CN.GB2312/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "帮助"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "私人"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "设置"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "用户"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "程序"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "管理员"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "因WebDAV接口故障，您的网络服务器好像并未允许文件同步。"
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "请双击<a href='%s'>安装向导</a>。"
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index 50483361c8b..987ae7830db 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: hyy0591 <yangyu.huang@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,7 +59,7 @@ msgstr "非法Email"
 msgid "Unable to delete group"
 msgstr "未能删除群组"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "未能删除用户"
 
@@ -137,16 +137,16 @@ msgstr "撤销"
 msgid "Unable to remove user"
 msgstr "无法移除用户"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "群组"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "群组管理员"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "删除"
 
@@ -325,11 +325,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 "
@@ -339,27 +339,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社区</a>开发，<a href=\"https://github.com/owncloud\" target=\"_blank\">s源代码</a> 以 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 许可协议发布。"
 
-#: 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 "在owncloud.com上查看应用程序"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>授权协议 <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "更新"
 
@@ -387,76 +387,76 @@ msgstr "Bug追踪者"
 msgid "Commercial Support"
 msgstr "商业支持"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "您已使用<strong>%s</strong>/<strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "获取应用并同步您的文件"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "再次显示首次运行向导"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "您已使用<strong>%s</strong>/<strong>%s</strong>"
+
+#: 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:81
+#: 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 "你的email地址"
 
-#: 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 "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "使用此地址来在您的文件管理器中连接您的ownCloud"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "登录名"
 
@@ -464,34 +464,40 @@ msgstr "登录名"
 msgid "Create"
 msgstr "新建"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "默认容量"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "无限制"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "其他"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "容量"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "更改显示名称"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "设置新的密码"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "默认"
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index 294b4004cbd..552bc73fd7b 100644
--- a/l10n/zh_CN.GB2312/user_ldap.po
+++ b/l10n/zh_CN.GB2312/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN.GB2312/user_webdavauth.po b/l10n/zh_CN.GB2312/user_webdavauth.po
index 60e0c7b0449..0956f14fc26 100644
--- a/l10n/zh_CN.GB2312/user_webdavauth.po
+++ b/l10n/zh_CN.GB2312/user_webdavauth.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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index b08441ca341..072c4f0c39e 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
-"Last-Translator: zhangmin <zm1990s@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,27 +20,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "用户 %s 与您共享了一个文件"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "用户 %s 与您共享了一个文件夹"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "用户 %s 与您共享了文件\"%s\"。文件下载地址：%s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "用户 %s 与您共享了文件夹\"%s\"。文件夹下载地址：%s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -393,7 +374,7 @@ msgstr "更新不成功。请汇报将此问题汇报给  <a href=\"https://gith
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "更新成功。正在重定向至 ownCloud。"
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "重置 ownCloud 密码"
 
@@ -421,7 +402,19 @@ msgstr "您将会收到包含可以重置密码链接的邮件。"
 msgid "Username"
 msgstr "用户名"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "请求重置"
 
@@ -469,6 +462,21 @@ msgstr "访问禁止"
 msgid "Cloud not found"
 msgstr "未找到云"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "您控制的web服务"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "编辑分类"
@@ -561,16 +569,12 @@ msgstr "数据库主机"
 msgid "Finish setup"
 msgstr "安装完成"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "您控制的web服务"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s 可用。获取更多关于如何升级的信息。"
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "注销"
 
@@ -604,6 +608,13 @@ msgstr "登录"
 msgid "Alternative Logins"
 msgstr "其他登录方式"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "上一页"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index a08c8d711f0..b61fe3b7c4d 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: zhangmin <zm1990s@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index 5384cb2ae23..fa7a66b2a51 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-08 02:03+0200\n"
-"PO-Revision-Date: 2013-06-07 09:23+0000\n"
-"Last-Translator: modokwang <modokwang@gmail.com>\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,61 +44,118 @@ msgstr "密码修改成功。"
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr "不能修改密码。旧密码可能不正确。"
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "保存中"
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "加密"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr "启用加密密码恢复密钥（允许共享恢复密钥）："
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr "恢复账户密码"
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr "开启"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr "禁用"
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr "变更加密密码恢复密钥："
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr "旧恢复账号密码"
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr "新恢复账号密码"
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr "修改密码"
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
-msgstr "通过与系统管理员共享全部文件启用密码恢复："
-
 #: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
-msgstr "启用该选项将允许你丢失密码时重新取得加密过的文件。"
+"files in case of password loss"
+msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr "文件恢复设置已更新"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr "不能更新文件恢复"
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index 640fc85f417..3b6586ea124 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index 44312ed4d87..5445e589df5 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "下载"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "没有预览"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "您控制的web服务"
diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po
index 46c482093db..11b73a1638e 100644
--- a/l10n/zh_CN/files_trashbin.po
+++ b/l10n/zh_CN/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 78f653355be..b61a5e154a4 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: modokwang <modokwang@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "帮助"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "个人"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "设置"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "用户"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "应用"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "管理"
 
@@ -114,76 +114,76 @@ msgstr "%s 您不能在数据库名称中使用英文句号。"
 msgid "%s set the database host."
 msgstr "%s 设置数据库所在主机。"
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL 数据库用户名和/或密码无效"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "你需要输入一个数据库中已有的账户或管理员账户。"
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr "不能建立甲骨文连接"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL 数据库用户名和/或密码无效"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "数据库错误：\"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "冲突命令为：\"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL 用户 '%s'@'localhost' 已存在。"
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "建议从 MySQL 数据库中丢弃 Drop 此用户"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL 用户 '%s'@'%%' 已存在"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "建议从 MySQL 数据库中丢弃 Drop 此用户。"
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle 数据库用户名和/或密码无效"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "冲突命令为：\"%s\"，名称：%s，密码：%s"
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL 用户名和/或密码无效：%s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "请认真检查<a href='%s'>安装指南</a>."
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 0a5d52aeb84..524169d86d6 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: modokwang <modokwang@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,7 +60,7 @@ msgstr "无效的电子邮件"
 msgid "Unable to delete group"
 msgstr "无法删除组"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "无法删除用户"
 
@@ -138,16 +138,16 @@ msgstr "撤销"
 msgid "Unable to remove user"
 msgstr "无法移除用户"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "组"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "组管理员"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "删除"
 
@@ -326,11 +326,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 "
@@ -340,27 +340,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud社区</a>开发，  <a href=\"https://github.com/owncloud\" target=\"_blank\">源代码</a>在<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>许可证下发布。"
 
-#: 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 "查看在 app.owncloud.com 的应用程序页面"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-核准： <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "更新"
 
@@ -388,76 +388,76 @@ msgstr "问题跟踪器"
 msgid "Commercial Support"
 msgstr "商业支持"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "你已使用 <strong>%s</strong>，有效空间 <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "安装应用进行文件同步"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "再次显示首次运行向导"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "你已使用 <strong>%s</strong>，有效空间 <strong>%s</strong>"
+
+#: 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:81
+#: 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 "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "用该地址来连接文件管理器中的 ownCloud"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "登录名称"
 
@@ -465,34 +465,40 @@ msgstr "登录名称"
 msgid "Create"
 msgstr "创建"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr "管理恢复密码"
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "默认存储"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "无限"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "其它"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "存储"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "修改显示名称"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "设置新密码"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "默认"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 64263ffbee5..06c3ec21444 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: modokwang <modokwang@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/user_webdavauth.po b/l10n/zh_CN/user_webdavauth.po
index 82c49c2fbc2..084e95b9302 100644
--- a/l10n/zh_CN/user_webdavauth.po
+++ b/l10n/zh_CN/user_webdavauth.po
@@ -11,8 +11,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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV 认证"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL：http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index f90883b9ccd..0f4b924ac86 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:17+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -19,26 +19,7 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr ""
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr ""
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr ""
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
+msgid "%s shared »%s« with you"
 msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "更新成功, 正"
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -420,7 +401,19 @@ msgstr "你將收到一封電郵"
 msgid "Username"
 msgstr "用戶名稱"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "重設"
 
@@ -468,6 +461,21 @@ msgstr ""
 msgid "Cloud not found"
 msgstr "未找到Cloud"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr ""
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr ""
@@ -560,16 +568,12 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr ""
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "登出"
 
@@ -603,6 +607,13 @@ msgstr "登入"
 msgid "Alternative Logins"
 msgstr ""
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "前一步"
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index 2d607d0d13d..ff12dc36a2b 100644
--- a/l10n/zh_HK/files.po
+++ b/l10n/zh_HK/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/files_encryption.po b/l10n/zh_HK/files_encryption.po
index 8956d5a1845..c61e3c1db8a 100644
--- a/l10n/zh_HK/files_encryption.po
+++ b/l10n/zh_HK/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,118 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "加密"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr ""
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
 msgstr ""
 
-#: templates/settings-personal.php:11
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+"files in case of password loss"
 msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr ""
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/zh_HK/files_external.po b/l10n/zh_HK/files_external.po
index 5c21b80f61b..d793ce84ac3 100644
--- a/l10n/zh_HK/files_external.po
+++ b/l10n/zh_HK/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po
index 8b29c417cc9..22a2697c1c8 100644
--- a/l10n/zh_HK/files_sharing.po
+++ b/l10n/zh_HK/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,3 @@ msgstr "下載"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr ""
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr ""
diff --git a/l10n/zh_HK/files_trashbin.po b/l10n/zh_HK/files_trashbin.po
index e38f02f6e97..816a70f3a40 100644
--- a/l10n/zh_HK/files_trashbin.po
+++ b/l10n/zh_HK/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po
index c8d4bb32a92..638d43a558e 100644
--- a/l10n/zh_HK/lib.po
+++ b/l10n/zh_HK/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "幫助"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "個人"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "設定"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "用戶"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "軟件"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "管理"
 
@@ -113,76 +113,76 @@ msgstr ""
 msgid "%s set the database host."
 msgstr ""
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr ""
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr ""
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr ""
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr ""
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr ""
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr ""
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po
index 97fe8645689..d631d63b55d 100644
--- a/l10n/zh_HK/settings.po
+++ b/l10n/zh_HK/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-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\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 ""
 
@@ -136,16 +136,16 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "群組"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 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
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: 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:81
+#: 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:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,40 @@ msgstr ""
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr ""
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index 103c0c926d6..a1f1dc6b182 100644
--- a/l10n/zh_HK/user_ldap.po
+++ b/l10n/zh_HK/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_HK/user_webdavauth.po b/l10n/zh_HK/user_webdavauth.po
index 944ff2142aa..7990321325c 100644
--- a/l10n/zh_HK/user_webdavauth.po
+++ b/l10n/zh_HK/user_webdavauth.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:26+0000\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "WebDAV Authentication"
 msgstr ""
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index c44ecd22824..67c10c0e857 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:22+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,27 +20,8 @@ msgstr ""
 
 #: ajax/share.php:97
 #, php-format
-msgid "User %s shared a file with you"
-msgstr "用戶 %s 與您分享了一個檔案"
-
-#: ajax/share.php:99
-#, php-format
-msgid "User %s shared a folder with you"
-msgstr "用戶 %s 與您分享了一個資料夾"
-
-#: ajax/share.php:101
-#, php-format
-msgid ""
-"User %s shared the file \"%s\" with you. It is available for download here: "
-"%s"
-msgstr "用戶 %s 與您分享了檔案 \"%s\" ，您可以從這裡下載它： %s"
-
-#: ajax/share.php:104
-#, php-format
-msgid ""
-"User %s shared the folder \"%s\" with you. It is available for download "
-"here: %s"
-msgstr "用戶 %s 與您分享了資料夾 \"%s\" ，您可以從這裡下載它： %s"
+msgid "%s shared »%s« with you"
+msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -393,7 +374,7 @@ msgstr "升級失敗，請將此問題回報 <a href=\"https://github.com/ownclo
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "升級成功，正將您重新導向至 ownCloud 。"
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:58
 msgid "ownCloud password reset"
 msgstr "ownCloud 密碼重設"
 
@@ -421,7 +402,19 @@ msgstr "重設密碼的連結將會寄到你的電子郵件信箱。"
 msgid "Username"
 msgstr "使用者名稱"
 
-#: lostpassword/templates/lostpassword.php:21
+#: 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?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:29
 msgid "Request reset"
 msgstr "請求重設"
 
@@ -469,6 +462,21 @@ msgstr "存取被拒"
 msgid "Cloud not found"
 msgstr "未發現雲端"
 
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+"Cheers!"
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:24
+msgid "web services under your control"
+msgstr "由您控制的網路服務"
+
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
 msgstr "編輯分類"
@@ -561,16 +569,12 @@ msgstr "資料庫主機"
 msgid "Finish setup"
 msgstr "完成設定"
 
-#: templates/layout.guest.php:40
-msgid "web services under your control"
-msgstr "由您控制的網路服務"
-
-#: templates/layout.user.php:37
+#: templates/layout.user.php:40
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s 已經釋出，瞭解更多資訊以進行更新。"
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "登出"
 
@@ -604,6 +608,13 @@ msgstr "登入"
 msgid "Alternative Logins"
 msgstr "替代登入方法"
 
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
+"href=\"%s\">View it!</a><br><br>Cheers!"
+msgstr ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "上一頁"
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index f7c4fea6592..2c79b51dd37 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:01+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/files_encryption.po b/l10n/zh_TW/files_encryption.po
index ed4c130a772..032ac45557c 100644
--- a/l10n/zh_TW/files_encryption.po
+++ b/l10n/zh_TW/files_encryption.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-14 02:46+0200\n"
+"PO-Revision-Date: 2013-06-14 00:47+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -44,61 +44,118 @@ msgstr "成功變更密碼。"
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr "無法變更密碼，或許是輸入的舊密碼不正確。"
 
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:7
+msgid ""
+"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"
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "儲存中..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr ""
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr ""
+
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
 msgstr "加密"
 
-#: templates/settings-admin.php:9
+#: templates/settings-admin.php:10
 msgid ""
 "Enable encryption passwords recovery key (allow sharing to recovery key):"
 msgstr ""
 
-#: templates/settings-admin.php:13
+#: templates/settings-admin.php:14
 msgid "Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr "已啓用"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
 msgstr "已停用"
 
-#: templates/settings-admin.php:32
+#: templates/settings-admin.php:34
 msgid "Change encryption passwords recovery key:"
 msgstr "變更加密密碼還原金鑰："
 
-#: templates/settings-admin.php:39
+#: templates/settings-admin.php:41
 msgid "Old Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:46
+#: templates/settings-admin.php:48
 msgid "New Recovery account password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
 msgstr "變更密碼"
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
-msgstr "與管理員分享所有檔案以啓用密碼還原功能："
-
 #: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:47
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
-msgstr "啓用此選項允許您未來遺失密碼時重新取得已加密的檔案"
+"files in case of password loss"
+msgstr ""
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
 msgstr "檔案還原設定已更新"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
 msgstr "無法更新檔案還原設定"
diff --git a/l10n/zh_TW/files_external.po b/l10n/zh_TW/files_external.po
index f3e6e3d588f..08202bfdd99 100644
--- a/l10n/zh_TW/files_external.po
+++ b/l10n/zh_TW/files_external.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index 3a52d7741a5..6b0936e5fc4 100644
--- a/l10n/zh_TW/files_sharing.po
+++ b/l10n/zh_TW/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,7 +43,3 @@ msgstr "下載"
 #: templates/public.php:40
 msgid "No preview available for"
 msgstr "無法預覽"
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "由您控制的網路服務"
diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po
index 31a0d0acdb3..9f259beac2d 100644
--- a/l10n/zh_TW/files_trashbin.po
+++ b/l10n/zh_TW/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index 87fa30df693..7f50bfecd6f 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
 "Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:357
+#: app.php:359
 msgid "Help"
 msgstr "說明"
 
-#: app.php:370
+#: app.php:372
 msgid "Personal"
 msgstr "個人"
 
-#: app.php:381
+#: app.php:383
 msgid "Settings"
 msgstr "設定"
 
-#: app.php:393
+#: app.php:395
 msgid "Users"
 msgstr "使用者"
 
-#: app.php:406
+#: app.php:408
 msgid "Apps"
 msgstr "應用程式"
 
-#: app.php:414
+#: app.php:416
 msgid "Admin"
 msgstr "管理"
 
@@ -114,76 +114,76 @@ msgstr "%s 資料庫名稱不能包含小數點"
 msgid "%s set the database host."
 msgstr "%s 設定資料庫主機。"
 
-#: setup.php:132 setup.php:329 setup.php:374
+#: setup.php:126 setup.php:332 setup.php:377
 msgid "PostgreSQL username and/or password not valid"
 msgstr "PostgreSQL 用戶名和/或密碼無效"
 
-#: setup.php:133 setup.php:238
+#: setup.php:127 setup.php:235
 msgid "You need to enter either an existing account or the administrator."
 msgstr "您必須輸入一個現有的帳號或管理員帳號。"
 
-#: setup.php:155
+#: setup.php:152
 msgid "Oracle connection could not be established"
 msgstr "無法建立 Oracle 資料庫連線"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
 msgstr "MySQL 用戶名和/或密碼無效"
 
-#: setup.php:291 setup.php:395 setup.php:404 setup.php:422 setup.php:432
-#: setup.php:441 setup.php:474 setup.php:540 setup.php:566 setup.php:573
-#: setup.php:584 setup.php:591 setup.php:600 setup.php:608 setup.php:617
-#: setup.php:623
+#: setup.php:288 setup.php:398 setup.php:407 setup.php:425 setup.php:435
+#: setup.php:444 setup.php:477 setup.php:543 setup.php:569 setup.php:576
+#: setup.php:587 setup.php:594 setup.php:603 setup.php:611 setup.php:620
+#: setup.php:626
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr "資料庫錯誤：\"%s\""
 
-#: setup.php:292 setup.php:396 setup.php:405 setup.php:423 setup.php:433
-#: setup.php:442 setup.php:475 setup.php:541 setup.php:567 setup.php:574
-#: setup.php:585 setup.php:601 setup.php:609 setup.php:618
+#: setup.php:289 setup.php:399 setup.php:408 setup.php:426 setup.php:436
+#: setup.php:445 setup.php:478 setup.php:544 setup.php:570 setup.php:577
+#: setup.php:588 setup.php:604 setup.php:612 setup.php:621
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr "有問題的指令是：\"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
 msgstr "MySQL 使用者 '%s'@'localhost' 已經存在。"
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
 msgstr "在 MySQL 移除這個使用者"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
 msgstr "MySQL 使用者 '%s'@'%%' 已經存在"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
 msgstr "在 MySQL 移除這個使用者。"
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
 msgstr "Oracle 用戶名和/或密碼無效"
 
-#: setup.php:592 setup.php:624
+#: setup.php:595 setup.php:627
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "有問題的指令是：\"%s\" ，使用者：\"%s\"，密碼：\"%s\""
 
-#: setup.php:644
+#: setup.php:647
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL 使用者和/或密碼無效：%s"
 
-#: setup.php:867
+#: setup.php:870
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "您的網頁伺服器尚未被正確設定來進行檔案同步，因為您的 WebDAV 界面似乎無法使用。"
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "請參考<a href='%s'>安裝指南</a>。"
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 39686f8b384..663a8cbb802 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-10 01:59+0200\n"
-"PO-Revision-Date: 2013-06-09 23:18+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,7 +59,7 @@ msgstr "無效的email"
 msgid "Unable to delete group"
 msgstr "群組刪除錯誤"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "使用者刪除錯誤"
 
@@ -137,16 +137,16 @@ msgstr "復原"
 msgid "Unable to remove user"
 msgstr "無法刪除用戶"
 
-#: js/users.js:92 templates/users.php:26 templates/users.php:83
-#: templates/users.php:108
+#: js/users.js:92 templates/users.php:26 templates/users.php:87
+#: templates/users.php:112
 msgid "Groups"
 msgstr "群組"
 
-#: js/users.js:95 templates/users.php:85 templates/users.php:120
+#: js/users.js:95 templates/users.php:89 templates/users.php:124
 msgid "Group Admin"
 msgstr "群組 管理員"
 
-#: js/users.js:115 templates/users.php:160
+#: js/users.js:115 templates/users.php:164
 msgid "Delete"
 msgstr "刪除"
 
@@ -325,11 +325,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 "
@@ -339,27 +339,27 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社區</a>開發，<a href=\"https://github.com/owncloud\" target=\"_blank\">源代碼</a>在<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>許可證下發布。"
 
-#: templates/apps.php:11
+#: templates/apps.php:13
 msgid "Add your App"
 msgstr "添加你的 App"
 
-#: templates/apps.php:12
+#: templates/apps.php:28
 msgid "More Apps"
 msgstr "更多Apps"
 
-#: 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 "查看應用程式頁面於 apps.owncloud.com"
 
-#: templates/apps.php:36
+#: templates/apps.php:41
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-核准: <span class=\"author\"></span>"
 
-#: templates/apps.php:38
+#: templates/apps.php:43
 msgid "Update"
 msgstr "更新"
 
@@ -387,76 +387,76 @@ msgstr "Bugtracker"
 msgid "Commercial Support"
 msgstr "商用支援"
 
-#: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "您已經使用了 <strong>%s</strong> ，目前可用空間為 <strong>%s</strong>"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
 msgstr "下載應用程式來同步您的檔案"
 
-#: templates/personal.php:26
+#: templates/personal.php:20
 msgid "Show First Run Wizard again"
 msgstr "再次顯示首次使用精靈"
 
-#: templates/personal.php:37 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:28
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr "您已經使用了 <strong>%s</strong> ，目前可用空間為 <strong>%s</strong>"
+
+#: 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:81
+#: 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 "WebDAV"
 
-#: templates/personal.php:102
+#: templates/personal.php:107
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "在您的檔案管理員中使用這個地址來連線到 ownCloud"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21 templates/users.php:84
 msgid "Login Name"
 msgstr "登入名稱"
 
@@ -464,34 +464,40 @@ msgstr "登入名稱"
 msgid "Create"
 msgstr "建立"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
 msgstr "管理者復原密碼"
 
-#: templates/users.php:38
+#: templates/users.php:37 templates/users.php:38
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:42
 msgid "Default Storage"
 msgstr "預設儲存區"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
 msgstr "無限制"
 
-#: templates/users.php:62 templates/users.php:153
+#: templates/users.php:66 templates/users.php:157
 msgid "Other"
 msgstr "其他"
 
-#: templates/users.php:87
+#: templates/users.php:91
 msgid "Storage"
 msgstr "儲存區"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
 msgstr "修改顯示名稱"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
 msgstr "設定新密碼"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "預設"
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index 9c279c50844..4b878bf470a 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/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-10 01:58+0200\n"
-"PO-Revision-Date: 2013-06-09 23:19+0000\n"
+"POT-Creation-Date: 2013-06-17 02:02+0200\n"
+"PO-Revision-Date: 2013-06-16 23:25+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/user_webdavauth.po b/l10n/zh_TW/user_webdavauth.po
index bfb582efc97..5e8abbbb84b 100644
--- a/l10n/zh_TW/user_webdavauth.po
+++ b/l10n/zh_TW/user_webdavauth.po
@@ -11,9 +11,9 @@ 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:26+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-06-15 01:59+0200\n"
+"PO-Revision-Date: 2013-06-15 00:00+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,8 +26,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV 認證"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "網址：http://"
+msgid "URL: "
+msgstr ""
 
 #: templates/settings.php:7
 msgid ""
diff --git a/lib/app.php b/lib/app.php
index c6f6e92e60e..f974dd9f594 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -174,7 +174,8 @@ class OC_App{
 		$apps=array('files');
 		$sql = 'SELECT `appid` FROM `*PREFIX*appconfig`'
 			.' WHERE `configkey` = \'enabled\' AND `configvalue`=\'yes\'';
-		if (OC_Config::getValue( 'dbtype', 'sqlite' ) === 'oci') { //FIXME oracle hack
+		if (OC_Config::getValue( 'dbtype', 'sqlite' ) === 'oci') {
+			//FIXME oracle hack: need to explicitly cast CLOB to CHAR for comparison
 			$sql = 'SELECT `appid` FROM `*PREFIX*appconfig`'
 			.' WHERE `configkey` = \'enabled\' AND to_char(`configvalue`)=\'yes\'';
 		}
@@ -348,7 +349,8 @@ class OC_App{
 
 		$settings = array();
 		// by default, settings only contain the help menu
-		if(OC_Config::getValue('knowledgebaseenabled', true)==true) {
+		if(OC_Util::getEditionString() === '' &&
+			OC_Config::getValue('knowledgebaseenabled', true)==true) {
 			$settings = array(
 				array(
 					"id" => "help",
diff --git a/lib/base.php b/lib/base.php
index a990cb7c1f5..4ef524e49e7 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -235,10 +235,7 @@ class OC {
 			$currentVersion = implode('.', OC_Util::getVersion());
 			if (version_compare($currentVersion, $installedVersion, '>')) {
 				if ($showTemplate && !OC_Config::getValue('maintenance', false)) {
-					OC_Config::setValue('maintenance', true);
-					OC_Log::write('core',
-						'starting upgrade from ' . $installedVersion . ' to ' . $currentVersion,
-						OC_Log::WARN);
+					OC_Config::setValue('theme', '');
 					$minimizerCSS = new OC_Minimizer_CSS();
 					$minimizerCSS->clearCache();
 					$minimizerJS = new OC_Minimizer_JS();
diff --git a/lib/config.php b/lib/config.php
index 9b87d4ce4e5..3cbb89fb981 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -187,7 +187,7 @@ class OC_Config{
 		}
 		// Prevent others not to read the config
 		@chmod($filename, 0640);
-
+		OC_Util::clearOpcodeCache();
 		return true;
 	}
 }
diff --git a/lib/connector/sabre/locks.php b/lib/connector/sabre/locks.php
index e58e584fb41..cbc495dec19 100644
--- a/lib/connector/sabre/locks.php
+++ b/lib/connector/sabre/locks.php
@@ -45,7 +45,12 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 		// but otherwise reading locks from SQLite Databases will return
 		// nothing
 		$query = 'SELECT * FROM `*PREFIX*locks`'
-			.' WHERE `userid` = ? AND (`created` + `timeout`) > '.time().' AND (( `uri` = ?)';
+			   .' WHERE `userid` = ? AND (`created` + `timeout`) > '.time().' AND (( `uri` = ?)';
+		if (OC_Config::getValue( "dbtype") === 'oci') {
+			//FIXME oracle hack: need to explicitly cast CLOB to CHAR for comparison
+			$query = 'SELECT * FROM `*PREFIX*locks`'
+				   .' WHERE `userid` = ? AND (`created` + `timeout`) > '.time().' AND (( to_char(`uri`) = ?)';
+		}
 		$params = array(OC_User::getUser(), $uri);
 
 		// We need to check locks for every part in the uri.
@@ -60,23 +65,31 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 
 			if ($currentPath) $currentPath.='/';
 			$currentPath.=$part;
-
-			$query.=' OR (`depth` != 0 AND `uri` = ?)';
+			//FIXME oracle hack: need to explicitly cast CLOB to CHAR for comparison
+			if (OC_Config::getValue( "dbtype") === 'oci') {
+				$query.=' OR (`depth` != 0 AND to_char(`uri`) = ?)';
+			} else {
+				$query.=' OR (`depth` != 0 AND `uri` = ?)';
+			}
 			$params[] = $currentPath;
 
 		}
 
 		if ($returnChildLocks) {
 
-			$query.=' OR (`uri` LIKE ?)';
+			//FIXME oracle hack: need to explicitly cast CLOB to CHAR for comparison
+			if (OC_Config::getValue( "dbtype") === 'oci') {
+				$query.=' OR (to_char(`uri`) LIKE ?)';
+			} else {
+				$query.=' OR (`uri` LIKE ?)';
+			}
 			$params[] = $uri . '/%';
 
 		}
 		$query.=')';
 
-		$stmt = OC_DB::prepare( $query );
-		$result = $stmt->execute( $params );
-
+		$result = OC_DB::executeAudited( $query, $params );
+		
 		$lockList = array();
 		while( $row = $result->fetchRow()) {
 
@@ -113,14 +126,17 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 		$locks = $this->getLocks($uri, false);
 		$exists = false;
 		foreach($locks as $lock) {
-			if ($lock->token == $lockInfo->token) $exists = true;
+			if ($lock->token == $lockInfo->token) {
+				$exists = true;
+				break;
+			}
 		}
 
 		if ($exists) {
-			$query = OC_DB::prepare( 'UPDATE `*PREFIX*locks`'
-				.' SET `owner` = ?, `timeout` = ?, `scope` = ?, `depth` = ?, `uri` = ?, `created` = ?'
-				.' WHERE `userid` = ? AND `token` = ?' );
-			$result = $query->execute( array(
+			$sql = 'UPDATE `*PREFIX*locks`'
+				 .' SET `owner` = ?, `timeout` = ?, `scope` = ?, `depth` = ?, `uri` = ?, `created` = ?'
+				 .' WHERE `userid` = ? AND `token` = ?';
+			$result = OC_DB::executeAudited( $sql, array(
 				$lockInfo->owner,
 				$lockInfo->timeout,
 				$lockInfo->scope,
@@ -131,10 +147,10 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 				$lockInfo->token)
 			);
 		} else {
-			$query = OC_DB::prepare( 'INSERT INTO `*PREFIX*locks`'
-				.' (`userid`,`owner`,`timeout`,`scope`,`depth`,`uri`,`created`,`token`)'
-				.' VALUES (?,?,?,?,?,?,?,?)' );
-			$result = $query->execute( array(
+			$sql = 'INSERT INTO `*PREFIX*locks`'
+				 .' (`userid`,`owner`,`timeout`,`scope`,`depth`,`uri`,`created`,`token`)'
+				 .' VALUES (?,?,?,?,?,?,?,?)';
+			$result = OC_DB::executeAudited( $sql, array(
 				OC_User::getUser(),
 				$lockInfo->owner,
 				$lockInfo->timeout,
@@ -159,8 +175,8 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 	 */
 	public function unlock($uri, Sabre_DAV_Locks_LockInfo $lockInfo) {
 
-		$query = OC_DB::prepare( 'DELETE FROM `*PREFIX*locks` WHERE `userid` = ? AND `uri` = ? AND `token` = ?' );
-		$result = $query->execute( array(OC_User::getUser(), $uri, $lockInfo->token));
+		$sql = 'DELETE FROM `*PREFIX*locks` WHERE `userid` = ? AND `uri` = ? AND `token` = ?';
+		$result = OC_DB::executeAudited( $sql, array(OC_User::getUser(), $uri, $lockInfo->token));
 
 		return $result->numRows() === 1;
 
diff --git a/lib/connector/sabre/maintenanceplugin.php b/lib/connector/sabre/maintenanceplugin.php
index 329fa4443ad..2eda269afc2 100644
--- a/lib/connector/sabre/maintenanceplugin.php
+++ b/lib/connector/sabre/maintenanceplugin.php
@@ -50,6 +50,9 @@ class OC_Connector_Sabre_MaintenancePlugin extends Sabre_DAV_ServerPlugin
 		if (OC_Config::getValue('maintenance', false)) {
 			throw new Sabre_DAV_Exception_ServiceUnavailable();
 		}
+		if (OC::checkUpgrade(false)) {
+			throw new Sabre_DAV_Exception_ServiceUnavailable('Upgrade needed');
+		}
 
 		return true;
 	}
diff --git a/lib/db.php b/lib/db.php
index 61836551833..a6b81aaba69 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -23,7 +23,8 @@
 class DatabaseException extends Exception{
 	private $query;
 
-	public function __construct($message, $query){
+	//FIXME getQuery seems to be unused, maybe use parent constructor with $message, $code and $previous
+	public function __construct($message, $query = null){
 		parent::__construct($message);
 		$this->query = $query;
 	}
@@ -392,9 +393,59 @@ class OC_DB {
 	}
 
 	/**
+	 * @brief execute a prepared statement, on error write log and throw exception
+	 * @param mixed $stmt PDOStatementWrapper | MDB2_Statement_Common ,
+	 *					  an array with 'sql' and optionally 'limit' and 'offset' keys
+	 *					.. or a simple sql query string
+	 * @param array $parameters
+	 * @return result
+	 * @throws DatabaseException
+	 */
+	static public function executeAudited( $stmt, array $parameters = null) {
+		if (is_string($stmt)) {
+			// convert to an array with 'sql'
+			if (stripos($stmt,'LIMIT') !== false) { //OFFSET requires LIMIT, se we only neet to check for LIMIT
+				// TODO try to convert LIMIT OFFSET notation to parameters, see fixLimitClauseForMSSQL
+				$message = 'LIMIT and OFFSET are forbidden for portability reasons,'
+						 . ' pass an array with \'limit\' and \'offset\' instead';
+				throw new DatabaseException($message);
+			}
+			$stmt = array('sql' => $stmt, 'limit' => null, 'offset' => null);
+		}
+		if (is_array($stmt)){
+			// convert to prepared statement
+			if ( ! array_key_exists('sql', $stmt) ) {
+				$message = 'statement array must at least contain key \'sql\'';
+				throw new DatabaseException($message);
+			}
+			if ( ! array_key_exists('limit', $stmt) ) {
+				$stmt['limit'] = null;
+			}
+			if ( ! array_key_exists('limit', $stmt) ) {
+				$stmt['offset'] = null;
+			}
+			$stmt = self::prepare($stmt['sql'], $stmt['limit'], $stmt['offset']);
+		}
+		self::raiseExceptionOnError($stmt, 'Could not prepare statement');
+		if ($stmt instanceof PDOStatementWrapper || $stmt instanceof MDB2_Statement_Common) {
+			$result = $stmt->execute($parameters);
+			self::raiseExceptionOnError($result, 'Could not execute statement');
+		} else {
+			if (is_object($stmt)) {
+				$message = 'Expected a prepared statement or array got ' . get_class($stmt);
+			} else {
+				$message = 'Expected a prepared statement or array got ' . gettype($stmt);
+			}
+			throw new DatabaseException($message);
+		}
+		return $result;
+	}
+
+	/**
 	 * @brief gets last value of autoincrement
 	 * @param string $table The optional table name (will replace *PREFIX*) and add sequence suffix
 	 * @return int id
+	 * @throws DatabaseException
 	 *
 	 * MDB2 lastInsertID()
 	 *
@@ -404,25 +455,27 @@ class OC_DB {
 	public static function insertid($table=null) {
 		self::connect();
 		$type = OC_Config::getValue( "dbtype", "sqlite" );
-		if( $type == 'pgsql' ) {
-			$query = self::prepare('SELECT lastval() AS id');
-			$row = $query->execute()->fetchRow();
+		if( $type === 'pgsql' ) {
+			$result = self::executeAudited('SELECT lastval() AS id');
+			$row = $result->fetchRow();
+			self::raiseExceptionOnError($row, 'fetching row for insertid failed');
 			return $row['id'];
-		}
-		if( $type == 'mssql' ) {
+		} else if( $type === 'mssql' || $type === 'oci') {
 			if($table !== null) {
 				$prefix = OC_Config::getValue( "dbtableprefix", "oc_" );
 				$table = str_replace( '*PREFIX*', $prefix, $table );
 			}
-			return self::$connection->lastInsertId($table);
-		}else{
+			$result = self::$connection->lastInsertId($table);
+		} else {
 			if($table !== null) {
 				$prefix = OC_Config::getValue( "dbtableprefix", "oc_" );
 				$suffix = OC_Config::getValue( "dbsequencesuffix", "_id_seq" );
 				$table = str_replace( '*PREFIX*', $prefix, $table ).$suffix;
 			}
-			return self::$connection->lastInsertId($table);
+			$result = self::$connection->lastInsertId($table);
 		}
+		self::raiseExceptionOnError($result, 'insertid failed');
+		return $result;
 	}
 
 	/**
@@ -512,11 +565,9 @@ class OC_DB {
 
 		//clean up memory
 		unlink( $file2 );
+		
+		self::raiseExceptionOnError($definition,'Failed to parse the database definition');
 
-		// Die in case something went wrong
-		if( $definition instanceof MDB2_Schema_Error ) {
-			OC_Template::printErrorPage( $definition->getMessage().': '.$definition->getUserInfo() );
-		}
 		if(OC_Config::getValue('dbtype', 'sqlite')==='oci') {
 			unset($definition['charset']); //or MDB2 tries SHUTDOWN IMMEDIATE
 			$oldname = $definition['name'];
@@ -528,11 +579,7 @@ class OC_DB {
 
 		$ret=self::$schema->createDatabase( $definition );
 
-		// Die in case something went wrong
-		if( $ret instanceof MDB2_Error ) {
-			OC_Template::printErrorPage( self::$MDB2->getDebugOutput().' '.$ret->getMessage() . ': '
-				. $ret->getUserInfo() );
-		}
+		self::raiseExceptionOnError($ret,'Failed to create the database structure');
 
 		return true;
 	}
@@ -547,18 +594,17 @@ class OC_DB {
 		$CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" );
 
 		self::connectScheme();
+		
+		if(OC_Config::getValue('dbtype', 'sqlite')==='oci') {
+			//set dbname, it is unset because oci uses 'service' to connect
+			self::$schema->db->database_name=self::$schema->db->dsn['username'];
+		}
 
 		// read file
 		$content = file_get_contents( $file );
 
 		$previousSchema = self::$schema->getDefinitionFromDatabase();
-		if (PEAR::isError($previousSchema)) {
-			$error = $previousSchema->getMessage();
-			$detail = $previousSchema->getDebugInfo();
-			$message = 'Failed to get existing database structure for updating ('.$error.', '.$detail.')';
-			OC_Log::write('core', $message, OC_Log::FATAL);
-			throw new Exception($message);
-		}
+		self::raiseExceptionOnError($previousSchema,'Failed to get existing database structure for updating');
 
 		// Make changes and save them to an in-memory file
 		$file2 = 'static://db_scheme';
@@ -576,19 +622,19 @@ class OC_DB {
 			$content = str_replace( '<default>0000-00-00 00:00:00</default>',
 				'<default>CURRENT_TIMESTAMP</default>', $content );
 		}
+		if(OC_Config::getValue('dbtype', 'sqlite')==='oci') {
+			unset($previousSchema['charset']); //or MDB2 tries SHUTDOWN IMMEDIATE
+			$oldname = $previousSchema['name'];
+			$previousSchema['name']=OC_Config::getValue( "dbuser", $oldname );
+			//TODO check identifiers are at most 30 chars long
+		}
 		file_put_contents( $file2, $content );
 		$op = self::$schema->updateDatabase($file2, $previousSchema, array(), false);
 
 		//clean up memory
 		unlink( $file2 );
 
-		if (PEAR::isError($op)) {
-			$error = $op->getMessage();
-			$detail = $op->getDebugInfo();
-			$message = 'Failed to update database structure ('.$error.', '.$detail.')';
-			OC_Log::write('core', $message, OC_Log::FATAL);
-			throw new Exception($message);
-		}
+		self::raiseExceptionOnError($op,'Failed to update database structure');
 		return true;
 	}
 
@@ -641,15 +687,9 @@ class OC_DB {
 			}
 			$query = substr($query, 0, strlen($query) - 5);
 			try {
-				$stmt = self::prepare($query);
-				$result = $stmt->execute($inserts);
-
-			} catch(PDOException $e) {
-				$entry = 'DB Error: "'.$e->getMessage() . '"<br />';
-				$entry .= 'Offending command was: ' . $query . '<br />';
-				OC_Log::write('core', $entry, OC_Log::FATAL);
-				error_log('DB error: '.$entry);
-				OC_Template::printErrorPage( $entry );
+				$result = self::executeAudited($query, $inserts);
+			} catch(DatabaseException $e) {
+				OC_Template::printExceptionErrorPage( $e );
 			}
 
 			if((int)$result->numRows() === 0) {
@@ -674,16 +714,12 @@ class OC_DB {
 		}
 
 		try {
-			$result = self::prepare($query);
+			$result = self::executeAudited($query, $inserts);
 		} catch(PDOException $e) {
-			$entry = 'DB Error: "'.$e->getMessage() . '"<br />';
-			$entry .= 'Offending command was: ' . $query.'<br />';
-			OC_Log::write('core', $entry, OC_Log::FATAL);
-			error_log('DB error: ' . $entry);
-			OC_Template::printErrorPage( $entry );
+			OC_Template::printExceptionErrorPage( $e );
 		}
 
-		return $result->execute($inserts);
+		return $result;
 	}
 
 	/**
@@ -891,7 +927,32 @@ class OC_DB {
 			return false;
 		}
 	}
+	/**
+	 * check if a result is an error and throws an exception, works with MDB2 and PDOException
+	 * @param mixed $result
+	 * @param string message
+	 * @return void
+	 * @throws DatabaseException
+	 */
+	public static function raiseExceptionOnError($result, $message = null) {
+		if(self::isError($result)) {
+			if ($message === null) {
+				$message = self::getErrorMessage($result);
+			} else {
+				$message .= ', Root cause:' . self::getErrorMessage($result);
+			}
+			throw new DatabaseException($message, self::getErrorCode($result));
+		}
+	}
 
+	public static function getErrorCode($error) {
+		if ( self::$backend==self::BACKEND_MDB2 and PEAR::isError($error) ) {
+			$code = $error->getCode();
+		} elseif ( self::$backend==self::BACKEND_PDO and self::$PDO ) {
+			$code = self::$PDO->errorCode();
+		}
+		return $code;
+	}
 	/**
 	 * returns the error code and message as a string for logging
 	 * works with MDB2 and PDOException
@@ -901,9 +962,7 @@ class OC_DB {
 	public static function getErrorMessage($error) {
 		if ( self::$backend==self::BACKEND_MDB2 and PEAR::isError($error) ) {
 			$msg = $error->getCode() . ': ' . $error->getMessage();
-			if (defined('DEBUG') && DEBUG) {
-				$msg .= '(' . $error->getDebugInfo() . ')';
-			}
+			$msg .= ' (' . $error->getDebugInfo() . ')';
 		} elseif (self::$backend==self::BACKEND_PDO and self::$PDO) {
 			$msg = self::$PDO->errorCode() . ': ';
 			$errorInfo = self::$PDO->errorInfo();
diff --git a/lib/defaults.php b/lib/defaults.php
new file mode 100644
index 00000000000..7dc6fbd0ada
--- /dev/null
+++ b/lib/defaults.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * Default strings and values which differ between the enterprise and the
+ * community edition. Use the get methods to always get the right strings.
+ */
+
+class OC_Defaults {
+
+	private static $communityEntity = "ownCloud";
+	private static $communityName = "ownCloud";
+	private static $communityBaseUrl = "http://owncloud.org";
+	private static $communitySyncClientUrl = " http://owncloud.org/sync-clients/";
+	private static $communityDocBaseUrl = "http://doc.owncloud.org";
+	private static $communitySlogan = "web services under your control";
+
+	private static $enterpriseEntity = "ownCloud Inc.";
+	private static $enterpriseName = "ownCloud Enterprise Edition";
+	private static $enterpriseBaseUrl = "https://owncloud.com";
+	private static $enterpriseDocBaseUrl = "http://doc.owncloud.com";
+	private static $enterpiseSyncClientUrl = "https://owncloud.com/products/desktop-clients";
+	private static $enterpriseSlogan = "Your Cloud, Your Data, Your Way!";
+
+
+	public static function getBaseUrl() {
+		if (OC_Util::getEditionString() === '') {
+			return self::$communityBaseUrl;
+		} else {
+			return self::$enterpriseBaseUrl;
+		}
+	}
+
+	public static function getSyncClientUrl() {
+		if (OC_Util::getEditionString() === '') {
+			return self::$communitySyncClientUrl;
+		} else {
+			return self::$enterpiseSyncClientUrl;
+		}
+	}
+
+	public static function getDocBaseUrl() {
+		if (OC_Util::getEditionString() === '') {
+			return self::$communityDocBaseUrl;
+		} else {
+			return self::$enterpriseDocBaseUrl;
+		}
+	}
+
+	public static function getName() {
+		if (OC_Util::getEditionString() === '') {
+			return self::$communityName;
+		} else {
+			return self::$enterpriseName;
+		}
+	}
+
+	public static function getEntity() {
+		if (OC_Util::getEditionString() === '') {
+			return self::$communityEntity;
+		} else {
+			return self::$enterpriseEntity;
+		}
+	}
+
+	public static function getSlogan() {
+		$l = OC_L10N::get('core');
+		if (OC_Util::getEditionString() === '') {
+			return $l->t(self::$communitySlogan);
+		} else {
+			return self::$enterpriseSlogan;
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/lib/files/cache/backgroundwatcher.php b/lib/files/cache/backgroundwatcher.php
index 8933101577d..923804f48d0 100644
--- a/lib/files/cache/backgroundwatcher.php
+++ b/lib/files/cache/backgroundwatcher.php
@@ -18,8 +18,8 @@ class BackgroundWatcher {
 		if (!is_null(self::$folderMimetype)) {
 			return self::$folderMimetype;
 		}
-		$query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = ?');
-		$result = $query->execute(array('httpd/unix-directory'));
+		$sql = 'SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = ?';
+		$result = \OC_DB::executeAudited($sql, array('httpd/unix-directory'));
 		$row = $result->fetchRow();
 		return $row['id'];
 	}
@@ -59,11 +59,11 @@ class BackgroundWatcher {
 	 */
 	static private function getNextFileId($previous, $folder) {
 		if ($folder) {
-			$query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `fileid` > ? AND mimetype = ' . self::getFolderMimetype() . ' ORDER BY `fileid` ASC', 1);
+			$stmt = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `fileid` > ? AND `mimetype` = ? ORDER BY `fileid` ASC', 1);
 		} else {
-			$query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `fileid` > ? AND mimetype != ' . self::getFolderMimetype() . ' ORDER BY `fileid` ASC', 1);
+			$stmt = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `fileid` > ? AND `mimetype` != ? ORDER BY `fileid` ASC', 1);
 		}
-		$result = $query->execute(array($previous));
+		$result = \OC_DB::executeAudited($stmt, array($previous,self::getFolderMimetype()));
 		if ($row = $result->fetchRow()) {
 			return $row['fileid'];
 		} else {
diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php
index cae2e63e4dc..3818fdbd840 100644
--- a/lib/files/cache/cache.php
+++ b/lib/files/cache/cache.php
@@ -65,13 +65,11 @@ class Cache {
 	 */
 	public function getMimetypeId($mime) {
 		if (!isset($this->mimetypeIds[$mime])) {
-			$query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = ?');
-			$result = $query->execute(array($mime));
+			$result = \OC_DB::executeAudited('SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = ?', array($mime));
 			if ($row = $result->fetchRow()) {
 				$this->mimetypeIds[$mime] = $row['id'];
 			} else {
-				$query = \OC_DB::prepare('INSERT INTO `*PREFIX*mimetypes`(`mimetype`) VALUES(?)');
-				$query->execute(array($mime));
+				$result = \OC_DB::executeAudited('INSERT INTO `*PREFIX*mimetypes`(`mimetype`) VALUES(?)', array($mime));
 				$this->mimetypeIds[$mime] = \OC_DB::insertid('*PREFIX*mimetypes');
 			}
 			$this->mimetypes[$this->mimetypeIds[$mime]] = $mime;
@@ -81,8 +79,8 @@ class Cache {
 
 	public function getMimetype($id) {
 		if (!isset($this->mimetypes[$id])) {
-			$query = \OC_DB::prepare('SELECT `mimetype` FROM `*PREFIX*mimetypes` WHERE `id` = ?');
-			$result = $query->execute(array($id));
+			$sql = 'SELECT `mimetype` FROM `*PREFIX*mimetypes` WHERE `id` = ?';
+			$result = \OC_DB::executeAudited($sql, array($id));
 			if ($row = $result->fetchRow()) {
 				$this->mimetypes[$id] = $row['mimetype'];
 			} else {
@@ -96,7 +94,7 @@ class Cache {
 	 * get the stored metadata of a file or folder
 	 *
 	 * @param string/int $file
-	 * @return array
+	 * @return array | false
 	 */
 	public function get($file) {
 		if (is_string($file) or $file == '') {
@@ -109,12 +107,18 @@ class Cache {
 			$where = 'WHERE `fileid` = ?';
 			$params = array($file);
 		}
-		$query = \OC_DB::prepare(
-			'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, `encrypted`, `unencrypted_size`, `etag`
-			 FROM `*PREFIX*filecache` ' . $where);
-		$result = $query->execute($params);
+		$sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`,
+					   `storage_mtime`, `encrypted`, `unencrypted_size`, `etag`
+				FROM `*PREFIX*filecache` ' . $where;
+		$result = \OC_DB::executeAudited($sql, $params);
 		$data = $result->fetchRow();
 
+		//FIXME hide this HACK in the next database layer, or just use doctrine and get rid of MDB2 and PDO
+		//PDO returns false, MDB2 returns null, oracle always uses MDB2, so convert null to false
+		if ($data === null) {
+			$data = false;
+		}
+
 		//merge partial data
 		if (!$data and  is_string($file)) {
 			if (isset($this->partial[$file])) {
@@ -147,14 +151,10 @@ class Cache {
 	public function getFolderContents($folder) {
 		$fileId = $this->getId($folder);
 		if ($fileId > -1) {
-			$query = \OC_DB::prepare(
-				'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, `encrypted`, `unencrypted_size`, `etag`
-			 	 FROM `*PREFIX*filecache` WHERE `parent` = ? ORDER BY `name` ASC');
-
-			$result = $query->execute(array($fileId));
-			if (\OC_DB::isError($result)) {
-				\OCP\Util::writeLog('cache', 'getFolderContents failed: ' . $result->getMessage(), \OCP\Util::ERROR);
-			}
+			$sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`,
+						   `storage_mtime`, `encrypted`, `unencrypted_size`, `etag`
+					FROM `*PREFIX*filecache` WHERE `parent` = ? ORDER BY `name` ASC';
+			$result = \OC_DB::executeAudited($sql,array($fileId));
 			$files = $result->fetchAll();
 			foreach ($files as &$file) {
 				$file['mimetype'] = $this->getMimetype($file['mimetype']);
@@ -208,12 +208,9 @@ class Cache {
 			$params[] = $this->getNumericStorageId();
 			$valuesPlaceholder = array_fill(0, count($queryParts), '?');
 
-			$query = \OC_DB::prepare('INSERT INTO `*PREFIX*filecache`(' . implode(', ', $queryParts) . ')'
-				. ' VALUES(' . implode(', ', $valuesPlaceholder) . ')');
-			$result = $query->execute($params);
-			if (\OC_DB::isError($result)) {
-				\OCP\Util::writeLog('cache', 'Insert to cache failed: ' . $result->getMessage(), \OCP\Util::ERROR);
-			}
+			$sql = 'INSERT INTO `*PREFIX*filecache` (' . implode(', ', $queryParts) . ')'
+				. ' VALUES (' . implode(', ', $valuesPlaceholder) . ')';
+			\OC_DB::executeAudited($sql, $params);
 
 			return (int)\OC_DB::insertid('*PREFIX*filecache');
 		}
@@ -240,9 +237,8 @@ class Cache {
 		list($queryParts, $params) = $this->buildParts($data);
 		$params[] = $id;
 
-		$query = \OC_DB::prepare('UPDATE `*PREFIX*filecache` SET ' . implode(' = ?, ', $queryParts) . '=?'
-			. ' WHERE fileid = ?');
-		$query->execute($params);
+		$sql = 'UPDATE `*PREFIX*filecache` SET ' . implode(' = ?, ', $queryParts) . '=? WHERE `fileid` = ?';
+		\OC_DB::executeAudited($sql, $params);
 	}
 
 	/**
@@ -289,9 +285,8 @@ class Cache {
 
 		$pathHash = md5($file);
 
-		$query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?');
-		$result = $query->execute(array($this->getNumericStorageId(), $pathHash));
-
+		$sql = 'SELECT `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?';
+		$result = \OC_DB::executeAudited($sql, array($this->getNumericStorageId(), $pathHash));
 		if ($row = $result->fetchRow()) {
 			return $row['fileid'];
 		} else {
@@ -340,8 +335,9 @@ class Cache {
 				$this->remove($child['path']);
 			}
 		}
-		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*filecache` WHERE `fileid` = ?');
-		$query->execute(array($entry['fileid']));
+		
+		$sql = 'DELETE FROM `*PREFIX*filecache` WHERE `fileid` = ?';
+		\OC_DB::executeAudited($sql, array($entry['fileid']));
 
 		$permissionsCache = new Permissions($this->storageId);
 		$permissionsCache->remove($entry['fileid']);
@@ -364,32 +360,31 @@ class Cache {
 
 		if ($sourceData['mimetype'] === 'httpd/unix-directory') {
 			//find all child entries
-			$query = \OC_DB::prepare('SELECT `path`, `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path` LIKE ?');
-			$result = $query->execute(array($this->getNumericStorageId(), $source . '/%'));
+			$sql = 'SELECT `path`, `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path` LIKE ?';
+			$result = \OC_DB::executeAudited($sql, array($this->getNumericStorageId(), $source . '/%'));
 			$childEntries = $result->fetchAll();
 			$sourceLength = strlen($source);
 			$query = \OC_DB::prepare('UPDATE `*PREFIX*filecache` SET `path` = ?, `path_hash` = ? WHERE `fileid` = ?');
 
 			foreach ($childEntries as $child) {
 				$targetPath = $target . substr($child['path'], $sourceLength);
-				$query->execute(array($targetPath, md5($targetPath), $child['fileid']));
+				\OC_DB::executeAudited($query, array($targetPath, md5($targetPath), $child['fileid']));
 			}
 		}
 
-		$query = \OC_DB::prepare('UPDATE `*PREFIX*filecache` SET `path` = ?, `path_hash` = ?, `name` = ?, `parent` =?'
-			. ' WHERE `fileid` = ?');
-		$query->execute(array($target, md5($target), basename($target), $newParentId, $sourceId));
+		$sql = 'UPDATE `*PREFIX*filecache` SET `path` = ?, `path_hash` = ?, `name` = ?, `parent` =? WHERE `fileid` = ?';
+		\OC_DB::executeAudited($sql, array($target, md5($target), basename($target), $newParentId, $sourceId));
 	}
 
 	/**
 	 * remove all entries for files that are stored on the storage from the cache
 	 */
 	public function clear() {
-		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*filecache` WHERE storage = ?');
-		$query->execute(array($this->getNumericStorageId()));
+		$sql = 'DELETE FROM `*PREFIX*filecache` WHERE `storage` = ?';
+		\OC_DB::executeAudited($sql, array($this->getNumericStorageId()));
 
-		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*storages` WHERE id = ?');
-		$query->execute(array($this->storageId));
+		$sql = 'DELETE FROM `*PREFIX*storages` WHERE `id` = ?';
+		\OC_DB::executeAudited($sql, array($this->storageId));
 	}
 
 	/**
@@ -402,11 +397,8 @@ class Cache {
 		$file = $this->normalize($file);
 
 		$pathHash = md5($file);
-		$query = \OC_DB::prepare('SELECT `size` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?');
-		$result = $query->execute(array($this->getNumericStorageId(), $pathHash));
-		if( \OC_DB::isError($result)) {
-			\OCP\Util::writeLog('cache', 'get status failed: ' . $result->getMessage(), \OCP\Util::ERROR);
-		}
+		$sql = 'SELECT `size` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?';
+		$result = \OC_DB::executeAudited($sql, array($this->getNumericStorageId(), $pathHash));
 		if ($row = $result->fetchRow()) {
 			if ((int)$row['size'] === -1) {
 				return self::SHALLOW;
@@ -433,11 +425,9 @@ class Cache {
 		// normalize pattern
 		$pattern = $this->normalize($pattern);
 
-		$query = \OC_DB::prepare('
-			SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `unencrypted_size`, `etag`
-			FROM `*PREFIX*filecache` WHERE `name` LIKE ? AND `storage` = ?'
-		);
-		$result = $query->execute(array($pattern, $this->getNumericStorageId()));
+		$sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `unencrypted_size`, `etag`
+				FROM `*PREFIX*filecache` WHERE `name` LIKE ? AND `storage` = ?';
+		$result = \OC_DB::executeAudited($sql, array($pattern, $this->getNumericStorageId()));
 		$files = array();
 		while ($row = $result->fetchRow()) {
 			$row['mimetype'] = $this->getMimetype($row['mimetype']);
@@ -459,12 +449,10 @@ class Cache {
 		} else {
 			$where = '`mimepart` = ?';
 		}
-		$query = \OC_DB::prepare('
-			SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `unencrypted_size`, `etag`
-			FROM `*PREFIX*filecache` WHERE ' . $where . ' AND `storage` = ?'
-		);
+		$sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `unencrypted_size`, `etag`
+				FROM `*PREFIX*filecache` WHERE ' . $where . ' AND `storage` = ?';
 		$mimetype = $this->getMimetypeId($mimetype);
-		$result = $query->execute(array($mimetype, $this->getNumericStorageId()));
+		$result = \OC_DB::executeAudited($sql, array($mimetype, $this->getNumericStorageId()));
 		$files = array();
 		while ($row = $result->fetchRow()) {
 			$row['mimetype'] = $this->getMimetype($row['mimetype']);
@@ -501,8 +489,8 @@ class Cache {
 		if ($id === -1) {
 			return 0;
 		}
-		$query = \OC_DB::prepare('SELECT `size` FROM `*PREFIX*filecache` WHERE `parent` = ? AND `storage` = ?');
-		$result = $query->execute(array($id, $this->getNumericStorageId()));
+		$sql = 'SELECT `size` FROM `*PREFIX*filecache` WHERE `parent` = ? AND `storage` = ?';
+		$result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId()));
 		$totalSize = 0;
 		$hasChilds = 0;
 		while ($row = $result->fetchRow()) {
@@ -528,8 +516,8 @@ class Cache {
 	 * @return int[]
 	 */
 	public function getAll() {
-		$query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ?');
-		$result = $query->execute(array($this->getNumericStorageId()));
+		$sql = 'SELECT `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ?';
+		$result = \OC_DB::executeAudited($sql, array($this->getNumericStorageId()));
 		$ids = array();
 		while ($row = $result->fetchRow()) {
 			$ids[] = $row['fileid'];
@@ -549,10 +537,7 @@ class Cache {
 	public function getIncomplete() {
 		$query = \OC_DB::prepare('SELECT `path` FROM `*PREFIX*filecache`'
 			. ' WHERE `storage` = ? AND `size` = -1 ORDER BY `fileid` DESC',1);
-		$result = $query->execute(array($this->getNumericStorageId()));
-		if (\OC_DB::isError($result)) {
-			\OCP\Util::writeLog('cache', 'getIncomplete failed: ' . $result->getMessage(), \OCP\Util::ERROR);
-		}
+		$result = \OC_DB::executeAudited($query, array($this->getNumericStorageId()));
 		if ($row = $result->fetchRow()) {
 			return $row['path'];
 		} else {
@@ -567,8 +552,8 @@ class Cache {
 	 * @return array, first element holding the storage id, second the path
 	 */
 	static public function getById($id) {
-		$query = \OC_DB::prepare('SELECT `storage`, `path` FROM `*PREFIX*filecache` WHERE `fileid` = ?');
-		$result = $query->execute(array($id));
+		$sql = 'SELECT `storage`, `path` FROM `*PREFIX*filecache` WHERE `fileid` = ?';
+		$result = \OC_DB::executeAudited($sql, array($id));
 		if ($row = $result->fetchRow()) {
 			$numericId = $row['storage'];
 			$path = $row['path'];
diff --git a/lib/files/cache/legacy.php b/lib/files/cache/legacy.php
index b8e2548639b..8eed1f67a5d 100644
--- a/lib/files/cache/legacy.php
+++ b/lib/files/cache/legacy.php
@@ -26,8 +26,8 @@ class Legacy {
 	 * @return int
 	 */
 	function getCount() {
-		$query = \OC_DB::prepare('SELECT COUNT(`id`) AS `count` FROM `*PREFIX*fscache` WHERE `user` = ?');
-		$result = $query->execute(array($this->user));
+		$sql = 'SELECT COUNT(`id`) AS `count` FROM `*PREFIX*fscache` WHERE `user` = ?';
+		$result = \OC_DB::executeAudited($sql, array($this->user));
 		if ($row = $result->fetchRow()) {
 			return $row['count'];
 		} else {
@@ -45,7 +45,7 @@ class Legacy {
 			return $this->cacheHasItems;
 		}
 		try {
-			$query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*fscache` WHERE `user` = ? LIMIT 1');
+			$query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*fscache` WHERE `user` = ?',1);
 		} catch (\Exception $e) {
 			$this->cacheHasItems = false;
 			return false;
@@ -74,11 +74,11 @@ class Legacy {
 	 */
 	function get($path) {
 		if (is_numeric($path)) {
-			$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*fscache` WHERE `id` = ?');
+			$sql = 'SELECT * FROM `*PREFIX*fscache` WHERE `id` = ?';
 		} else {
-			$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*fscache` WHERE `path` = ?');
+			$sql = 'SELECT * FROM `*PREFIX*fscache` WHERE `path` = ?';
 		}
-		$result = $query->execute(array($path));
+		$result = \OC_DB::executeAudited($sql, array($path));
 		$data = $result->fetchRow();
 		$data['etag'] = $this->getEtag($data['path'], $data['user']);
 		return $data;
@@ -111,7 +111,7 @@ class Legacy {
 		if(is_null($query)){
 			$query = \OC_DB::prepare('SELECT `propertyvalue` FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = \'{DAV:}getetag\'');
 		}
-		$result = $query->execute(array($user, '/' . $relativePath));
+		$result = \OC_DB::executeAudited($query,array($user, '/' . $relativePath));
 		if ($row = $result->fetchRow()) {
 			return trim($row['propertyvalue'], '"');
 		} else {
@@ -126,8 +126,7 @@ class Legacy {
 	 * @return array
 	 */
 	function getChildren($id) {
-		$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*fscache` WHERE `parent` = ?');
-		$result = $query->execute(array($id));
+		$result = \OC_DB::executeAudited('SELECT * FROM `*PREFIX*fscache` WHERE `parent` = ?', array($id));
 		$data = $result->fetchAll();
 		foreach ($data as $i => $item) {
 			$data[$i]['etag'] = $this->getEtag($item['path'], $item['user']);
diff --git a/lib/files/cache/permissions.php b/lib/files/cache/permissions.php
index 29c30b0f36c..2e2bdb20b78 100644
--- a/lib/files/cache/permissions.php
+++ b/lib/files/cache/permissions.php
@@ -33,8 +33,8 @@ class Permissions {
 	 * @return int (-1 if file no permissions set)
 	 */
 	public function get($fileId, $user) {
-		$query = \OC_DB::prepare('SELECT `permissions` FROM `*PREFIX*permissions` WHERE `user` = ? AND `fileid` = ?');
-		$result = $query->execute(array($user, $fileId));
+		$sql = 'SELECT `permissions` FROM `*PREFIX*permissions` WHERE `user` = ? AND `fileid` = ?';
+		$result = \OC_DB::executeAudited($sql, array($user, $fileId));
 		if ($row = $result->fetchRow()) {
 			return $row['permissions'];
 		} else {
@@ -51,13 +51,11 @@ class Permissions {
 	 */
 	public function set($fileId, $user, $permissions) {
 		if (self::get($fileId, $user) !== -1) {
-			$query = \OC_DB::prepare('UPDATE `*PREFIX*permissions` SET `permissions` = ?'
-				. ' WHERE `user` = ? AND `fileid` = ?');
+			$sql = 'UPDATE `*PREFIX*permissions` SET `permissions` = ? WHERE `user` = ? AND `fileid` = ?';
 		} else {
-			$query = \OC_DB::prepare('INSERT INTO `*PREFIX*permissions`(`permissions`, `user`, `fileid`)'
-				. ' VALUES(?, ?,? )');
+			$sql = 'INSERT INTO `*PREFIX*permissions`(`permissions`, `user`, `fileid`) VALUES(?, ?,? )';
 		}
-		$query->execute(array($permissions, $user, $fileId));
+		\OC_DB::executeAudited($sql, array($permissions, $user, $fileId));
 	}
 
 	/**
@@ -75,9 +73,9 @@ class Permissions {
 		$params[] = $user;
 		$inPart = implode(', ', array_fill(0, count($fileIds), '?'));
 
-		$query = \OC_DB::prepare('SELECT `fileid`, `permissions` FROM `*PREFIX*permissions`'
-			. ' WHERE `fileid` IN (' . $inPart . ') AND `user` = ?');
-		$result = $query->execute($params);
+		$sql = 'SELECT `fileid`, `permissions` FROM `*PREFIX*permissions`'
+			. ' WHERE `fileid` IN (' . $inPart . ') AND `user` = ?';
+		$result = \OC_DB::executeAudited($sql, $params);
 		$filePermissions = array();
 		while ($row = $result->fetchRow()) {
 			$filePermissions[$row['fileid']] = $row['permissions'];
@@ -93,11 +91,12 @@ class Permissions {
 	 * @return int[]
 	 */
 	public function getDirectoryPermissions($parentId, $user) {
-		$query = \OC_DB::prepare('SELECT `*PREFIX*permissions`.`fileid`, `permissions`
-			FROM `*PREFIX*permissions` INNER JOIN `*PREFIX*filecache` ON `*PREFIX*permissions`.`fileid` = `*PREFIX*filecache`.`fileid`
-			WHERE `*PREFIX*filecache`.`parent` = ? AND `*PREFIX*permissions`.`user` = ?');
+		$sql = 'SELECT `*PREFIX*permissions`.`fileid`, `permissions`
+			FROM `*PREFIX*permissions`
+			INNER JOIN `*PREFIX*filecache` ON `*PREFIX*permissions`.`fileid` = `*PREFIX*filecache`.`fileid`
+			WHERE `*PREFIX*filecache`.`parent` = ? AND `*PREFIX*permissions`.`user` = ?';
 
-		$result = $query->execute(array($parentId, $user));
+		$result = \OC_DB::executeAudited($sql, array($parentId, $user));
 		$filePermissions = array();
 		while ($row = $result->fetchRow()) {
 			$filePermissions[$row['fileid']] = $row['permissions'];
@@ -113,18 +112,17 @@ class Permissions {
 	 */
 	public function remove($fileId, $user = null) {
 		if (is_null($user)) {
-			$query = \OC_DB::prepare('DELETE FROM `*PREFIX*permissions` WHERE `fileid` = ?');
-			$query->execute(array($fileId));
+			\OC_DB::executeAudited('DELETE FROM `*PREFIX*permissions` WHERE `fileid` = ?', array($fileId));
 		} else {
-			$query = \OC_DB::prepare('DELETE FROM `*PREFIX*permissions` WHERE `fileid` = ? AND `user` = ?');
-			$query->execute(array($fileId, $user));
+			$sql = 'DELETE FROM `*PREFIX*permissions` WHERE `fileid` = ? AND `user` = ?';
+			\OC_DB::executeAudited($sql, array($fileId, $user));
 		}
 	}
 
 	public function removeMultiple($fileIds, $user) {
 		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*permissions` WHERE `fileid` = ? AND `user` = ?');
 		foreach ($fileIds as $fileId) {
-			$query->execute(array($fileId, $user));
+			\OC_DB::executeAudited($query, array($fileId, $user));
 		}
 	}
 
@@ -134,8 +132,8 @@ class Permissions {
 	 * @param int $fileId
 	 */
 	public function getUsers($fileId) {
-		$query = \OC_DB::prepare('SELECT `user` FROM `*PREFIX*permissions` WHERE `fileid` = ?');
-		$result = $query->execute(array($fileId));
+		$sql = 'SELECT `user` FROM `*PREFIX*permissions` WHERE `fileid` = ?';
+		$result = \OC_DB::executeAudited($sql, array($fileId));
 		$users = array();
 		while ($row = $result->fetchRow()) {
 			$users[] = $row['user'];
diff --git a/lib/files/cache/storage.php b/lib/files/cache/storage.php
index 72de376798c..8a9e47ca36d 100644
--- a/lib/files/cache/storage.php
+++ b/lib/files/cache/storage.php
@@ -32,13 +32,13 @@ class Storage {
 			$this->storageId = md5($this->storageId);
 		}
 
-		$query = \OC_DB::prepare('SELECT `numeric_id` FROM `*PREFIX*storages` WHERE `id` = ?');
-		$result = $query->execute(array($this->storageId));
+		$sql = 'SELECT `numeric_id` FROM `*PREFIX*storages` WHERE `id` = ?';
+		$result = \OC_DB::executeAudited($sql, array($this->storageId));
 		if ($row = $result->fetchRow()) {
 			$this->numericId = $row['numeric_id'];
 		} else {
-			$query = \OC_DB::prepare('INSERT INTO `*PREFIX*storages`(`id`) VALUES(?)');
-			$query->execute(array($this->storageId));
+			$sql = 'INSERT INTO `*PREFIX*storages` (`id`) VALUES(?)';
+			\OC_DB::executeAudited($sql, array($this->storageId));
 			$this->numericId = \OC_DB::insertid('*PREFIX*storages');
 		}
 	}
@@ -48,8 +48,9 @@ class Storage {
 	}
 
 	public static function getStorageId($numericId) {
-		$query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*storages` WHERE `numeric_id` = ?');
-		$result = $query->execute(array($numericId));
+		
+		$sql = 'SELECT `id` FROM `*PREFIX*storages` WHERE `numeric_id` = ?';
+		$result = \OC_DB::executeAudited($sql, array($numericId));
 		if ($row = $result->fetchRow()) {
 			return $row['id'];
 		} else {
diff --git a/lib/files/cache/upgrade.php b/lib/files/cache/upgrade.php
index ca044ba81de..cfb9a117311 100644
--- a/lib/files/cache/upgrade.php
+++ b/lib/files/cache/upgrade.php
@@ -78,7 +78,7 @@ class Upgrade {
 				VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)');
 		}
 		if (!$this->inCache($data['storage'], $data['path_hash'], $data['id'])) {
-			$insertQuery->execute(array($data['id'], $data['storage'],
+			\OC_DB::executeAudited($insertQuery, array($data['id'], $data['storage'],
 				$data['path'], $data['path_hash'], $data['parent'], $data['name'],
 				$data['mimetype'], $data['mimepart'], $data['size'], $data['mtime'], $data['encrypted'], $data['etag']));
 		}
@@ -97,7 +97,7 @@ class Upgrade {
 		if(is_null($query)) {
 			$query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE (`storage` = ? AND `path_hash` = ?) OR `fileid` = ?');
 		}
-		$result = $query->execute(array($storage, $pathHash, $id));
+		$result = \OC_DB::executeAudited($query, array($storage, $pathHash, $id));
 		return (bool)$result->fetchRow();
 	}
 
diff --git a/lib/files/mapper.php b/lib/files/mapper.php
index 15f5f0628b5..47abd4e52fe 100644
--- a/lib/files/mapper.php
+++ b/lib/files/mapper.php
@@ -53,11 +53,9 @@ class Mapper
 		}
 
 		if ($isLogicPath) {
-			$query = \OC_DB::prepare('DELETE FROM `*PREFIX*file_map` WHERE `logic_path` LIKE ?');
-			$query->execute(array($path));
+			\OC_DB::executeAudited('DELETE FROM `*PREFIX*file_map` WHERE `logic_path` LIKE ?', array($path));
 		} else {
-			$query = \OC_DB::prepare('DELETE FROM `*PREFIX*file_map` WHERE `physic_path` LIKE ?');
-			$query->execute(array($path));
+			\OC_DB::executeAudited('DELETE FROM `*PREFIX*file_map` WHERE `physic_path` LIKE ?', array($path));
 		}
 	}
 
@@ -73,8 +71,8 @@ class Mapper
 		$physicPath1 = $this->logicToPhysical($path1, true);
 		$physicPath2 = $this->logicToPhysical($path2, true);
 
-		$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*file_map` WHERE `logic_path` LIKE ?');
-		$result = $query->execute(array($path1.'%'));
+		$sql = 'SELECT * FROM `*PREFIX*file_map` WHERE `logic_path` LIKE ?';
+		$result = \OC_DB::executeAudited($sql, array($path1.'%'));
 		$updateQuery = \OC_DB::prepare('UPDATE `*PREFIX*file_map`'
 			.' SET `logic_path` = ?'
 			.' , `logic_path_hash` = ?'
@@ -88,7 +86,8 @@ class Mapper
 			$newPhysic = $physicPath2.$this->stripRootFolder($currentPhysic, $physicPath1);
 			if ($path1 !== $currentLogic) {
 				try {
-					$updateQuery->execute(array($newLogic, md5($newLogic), $newPhysic, md5($newPhysic), $currentLogic));
+					\OC_DB::executeAudited($updateQuery, array($newLogic, md5($newLogic), $newPhysic, md5($newPhysic),
+						$currentLogic));
 				} catch (\Exception $e) {
 					error_log('Mapper::Copy failed '.$currentLogic.' -> '.$newLogic.'\n'.$e);
 					throw $e;
@@ -123,8 +122,8 @@ class Mapper
 
 	private function resolveLogicPath($logicPath) {
 		$logicPath = $this->stripLast($logicPath);
-		$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*file_map` WHERE `logic_path_hash` = ?');
-		$result = $query->execute(array(md5($logicPath)));
+		$sql = 'SELECT * FROM `*PREFIX*file_map` WHERE `logic_path_hash` = ?';
+		$result = \OC_DB::executeAudited($sql, array(md5($logicPath)));
 		$result = $result->fetchRow();
 		if ($result === false) {
 			return null;
@@ -135,8 +134,8 @@ class Mapper
 
 	private function resolvePhysicalPath($physicalPath) {
 		$physicalPath = $this->stripLast($physicalPath);
-		$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*file_map` WHERE `physic_path_hash` = ?');
-		$result = $query->execute(array(md5($physicalPath)));
+		$sql = \OC_DB::prepare('SELECT * FROM `*PREFIX*file_map` WHERE `physic_path_hash` = ?');
+		$result = \OC_DB::executeAudited($sql, array(md5($physicalPath)));
 		$result = $result->fetchRow();
 
 		return $result['logic_path'];
@@ -163,8 +162,9 @@ class Mapper
 	}
 
 	private function insert($logicPath, $physicalPath) {
-		$query = \OC_DB::prepare('INSERT INTO `*PREFIX*file_map`(`logic_path`, `physic_path`, `logic_path_hash`, `physic_path_hash`) VALUES(?, ?, ?, ?)');
-		$query->execute(array($logicPath, $physicalPath, md5($logicPath), md5($physicalPath)));
+		$sql = 'INSERT INTO `*PREFIX*file_map` (`logic_path`, `physic_path`, `logic_path_hash`, `physic_path_hash`)
+				VALUES (?, ?, ?, ?)';
+		\OC_DB::executeAudited($sql, array($logicPath, $physicalPath, md5($logicPath), md5($physicalPath)));
 	}
 
 	public function slugifyPath($path, $index=null) {
@@ -172,14 +172,9 @@ class Mapper
 
 		$pathElements = explode('/', $path);
 		$sluggedElements = array();
-
-		// rip off the extension ext from last element
+		
 		$last= end($pathElements);
-		$parts = pathinfo($last);
-		$filename = $parts['filename'];
-		array_pop($pathElements);
-		array_push($pathElements, $filename);
-
+		
 		foreach ($pathElements as $pathElement) {
 			// remove empty elements
 			if (empty($pathElement)) {
@@ -192,13 +187,15 @@ class Mapper
 		// apply index to file name
 		if ($index !== null) {
 			$last= array_pop($sluggedElements);
-			array_push($sluggedElements, $last.'-'.$index);
-		}
+			
+			// if filename contains periods - add index number before last period
+			if (preg_match('~\.[^\.]+$~i',$last,$extension)){
+				array_push($sluggedElements, substr($last,0,-(strlen($extension[0]))).'-'.$index.$extension[0]);
+			} else {
+				// if filename doesn't contain periods add index ofter the last char
+				array_push($sluggedElements, $last.'-'.$index);
+				}
 
-		// add back the extension
-		if (isset($parts['extension'])) {
-			$last= array_pop($sluggedElements);
-			array_push($sluggedElements, $last.'.'.$parts['extension']);
 		}
 
 		$sluggedPath = $this->unchangedPhysicalRoot.implode('/', $sluggedElements);
@@ -213,8 +210,8 @@ class Mapper
 	 */
 	private function slugify($text)
 	{
-		// replace non letter or digits by -
-		$text = preg_replace('~[^\\pL\d]+~u', '-', $text);
+		// replace non letter or digits or dots by -
+		$text = preg_replace('~[^\\pL\d\.]+~u', '-', $text);
 
 		// trim
 		$text = trim($text, '-');
@@ -228,7 +225,10 @@ class Mapper
 		$text = strtolower($text);
 
 		// remove unwanted characters
-		$text = preg_replace('~[^-\w]+~', '', $text);
+		$text = preg_replace('~[^-\w\.]+~', '', $text);
+		
+		// trim ending dots (for security reasons and win compatibility)
+		$text = preg_replace('~\.+$~', '', $text);
 
 		if (empty($text)) {
 			return uniqid();
diff --git a/lib/helper.php b/lib/helper.php
index 225e9fd2a9a..a315c640d1a 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -364,6 +364,26 @@ class OC_Helper {
 	}
 
 	/**
+	 * Try to guess the mimetype based on filename
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	static public function getFileNameMimeType($path){
+		if(strpos($path, '.')) {
+			//try to guess the type by the file extension
+			if(!self::$mimetypes || self::$mimetypes != include 'mimetypes.list.php') {
+				self::$mimetypes=include 'mimetypes.list.php';
+			}
+			$extension=strtolower(strrchr(basename($path), "."));
+			$extension=substr($extension, 1);//remove leading .
+			return (isset(self::$mimetypes[$extension]))?self::$mimetypes[$extension]:'application/octet-stream';
+		}else{
+			return 'application/octet-stream';
+		}
+	}
+
+	/**
 	 * get the mimetype form a local file
 	 * @param string $path
 	 * @return string
@@ -377,17 +397,7 @@ class OC_Helper {
 			return "httpd/unix-directory";
 		}
 
-		if(strpos($path, '.')) {
-			//try to guess the type by the file extension
-			if(!self::$mimetypes || self::$mimetypes != include 'mimetypes.list.php') {
-				self::$mimetypes=include 'mimetypes.list.php';
-			}
-			$extension=strtolower(strrchr(basename($path), "."));
-			$extension=substr($extension, 1);//remove leading .
-			$mimeType=(isset(self::$mimetypes[$extension]))?self::$mimetypes[$extension]:'application/octet-stream';
-		}else{
-			$mimeType='application/octet-stream';
-		}
+		$mimeType = self::getFileNameMimeType($path);
 
 		if($mimeType=='application/octet-stream' and function_exists('finfo_open')
 			and function_exists('finfo_file') and $finfo=finfo_open(FILEINFO_MIME)) {
@@ -609,7 +619,7 @@ class OC_Helper {
 	}
 
 	/**
-	 * remove all files in PHP /oc-noclean temp dir 
+	 * remove all files in PHP /oc-noclean temp dir
 	 */
 	public static function cleanTmpNoClean() {
 		$tmpDirNoCleanFile=get_temp_dir().'/oc-noclean/';
diff --git a/lib/l10n/da.php b/lib/l10n/da.php
index aead17f510e..3202ae3a335 100644
--- a/lib/l10n/da.php
+++ b/lib/l10n/da.php
@@ -24,6 +24,7 @@
 "%s set the database host." => "%s sæt database værten.",
 "PostgreSQL username and/or password not valid" => "PostgreSQL brugernavn og/eller kodeord er ikke gyldigt.",
 "You need to enter either an existing account or the administrator." => "Du bliver nødt til at indtaste en eksisterende bruger eller en administrator.",
+"Oracle connection could not be established" => "Oracle forbindelsen kunne ikke etableres",
 "MySQL username and/or password not valid" => "MySQL brugernavn og/eller kodeord er ikke gyldigt.",
 "DB Error: \"%s\"" => "Databasefejl: \"%s\"",
 "Offending command was: \"%s\"" => "Fejlende kommando var: \"%s\"",
diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php
index 1df1b16de65..b4b2a33cd01 100644
--- a/lib/l10n/es_AR.php
+++ b/lib/l10n/es_AR.php
@@ -24,6 +24,7 @@
 "%s set the database host." => "%s Especifique la dirección de la Base de Datos",
 "PostgreSQL username and/or password not valid" => "Nombre de usuario o contraseña de PostgradeSQL no válido.",
 "You need to enter either an existing account or the administrator." => "Debe ingresar una cuenta existente o el administrador",
+"Oracle connection could not be established" => "No fue posible establecer la conexión a Oracle",
 "MySQL username and/or password not valid" => "Usuario y/o contraseña MySQL no válido",
 "DB Error: \"%s\"" => "Error DB: \"%s\"",
 "Offending command was: \"%s\"" => "El comando no comprendido es: \"%s\"",
diff --git a/lib/public/share.php b/lib/public/share.php
index 81f5515bb4b..122ab3fa030 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -152,11 +152,11 @@ class Share {
 
 			// Fetch all shares of this file path from DB
 			$query = \OC_DB::prepare(
-				'SELECT share_with
+				'SELECT `share_with`
 				FROM
 				`*PREFIX*share`
 				WHERE
-				item_source = ? AND share_type = ?'
+				`item_source` = ? AND `share_type` = ?'
 			);
 
 			$result = $query->execute(array($source, self::SHARE_TYPE_USER));
@@ -171,11 +171,11 @@ class Share {
 			// We also need to take group shares into account
 
 			$query = \OC_DB::prepare(
-				'SELECT share_with
+				'SELECT `share_with`
 				FROM
 				`*PREFIX*share`
 				WHERE
-				item_source = ? AND share_type = ?'
+				`item_source` = ? AND `share_type` = ?'
 			);
 
 			$result = $query->execute(array($source, self::SHARE_TYPE_GROUP));
@@ -192,11 +192,11 @@ class Share {
 			//check for public link shares
 			if (!$publicShare) {
 				$query = \OC_DB::prepare(
-					'SELECT share_with
+					'SELECT `share_with`
 					FROM
 					`*PREFIX*share`
 					WHERE
-					item_source = ? AND share_type = ?'
+					`item_source` = ? AND `share_type` = ?'
 				);
 
 				$result = $query->execute(array($source, self::SHARE_TYPE_LINK));
@@ -1586,10 +1586,10 @@ class Share {
 
 	public static function post_removeFromGroup($arguments) {
 		// TODO Don't call if user deleted?
-		$query = \OC_DB::prepare('SELECT `id`, `share_type` FROM `*PREFIX*share`'
-			.' WHERE (`share_type` = ? AND `share_with` = ?) OR (`share_type` = ? AND `share_with` = ?)');
-		$result = $query->execute(array(self::SHARE_TYPE_GROUP, $arguments['gid'], self::$shareTypeGroupUserUnique,
-			$arguments['uid']));
+		$sql = 'SELECT `id`, `share_type` FROM `*PREFIX*share`'
+			.' WHERE (`share_type` = ? AND `share_with` = ?) OR (`share_type` = ? AND `share_with` = ?)';
+		$result = \OC_DB::executeAudited($sql, array(self::SHARE_TYPE_GROUP, $arguments['gid'],
+			self::$shareTypeGroupUserUnique, $arguments['uid']));
 		while ($item = $result->fetchRow()) {
 			if ($item['share_type'] == self::SHARE_TYPE_GROUP) {
 				// Delete all reshares by this user of the group share
@@ -1601,8 +1601,8 @@ class Share {
 	}
 
 	public static function post_deleteGroup($arguments) {
-		$query = \OC_DB::prepare('SELECT id FROM `*PREFIX*share` WHERE `share_type` = ? AND `share_with` = ?');
-		$result = $query->execute(array(self::SHARE_TYPE_GROUP, $arguments['gid']));
+		$sql = 'SELECT `id` FROM `*PREFIX*share` WHERE `share_type` = ? AND `share_with` = ?';
+		$result = \OC_DB::executeAudited($sql, array(self::SHARE_TYPE_GROUP, $arguments['gid']));
 		while ($item = $result->fetchRow()) {
 			self::delete($item['id']);
 		}
diff --git a/lib/response.php b/lib/response.php
index 49d79fda709..674176d078b 100644
--- a/lib/response.php
+++ b/lib/response.php
@@ -11,6 +11,7 @@ class OC_Response {
 	const STATUS_NOT_MODIFIED = 304;
 	const STATUS_TEMPORARY_REDIRECT = 307;
 	const STATUS_NOT_FOUND = 404;
+	const STATUS_INTERNAL_SERVER_ERROR = 500;
 
 	/**
 	* @brief Enable response caching by sending correct HTTP headers
@@ -70,6 +71,9 @@ class OC_Response {
 			case self::STATUS_NOT_FOUND;
 				$status = $status . ' Not Found';
 				break;
+			case self::STATUS_INTERNAL_SERVER_ERROR;
+				$status = $status . ' Internal Server Error';
+				break;
 		}
 		header($protocol.' '.$status);
 	}
diff --git a/lib/setup.php b/lib/setup.php
index a63cc664dbc..61ef7d22b11 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -4,7 +4,7 @@ class DatabaseSetupException extends Exception
 {
 	private $hint;
 
-	public function __construct($message, $hint, $code = 0, Exception $previous = null) {
+	public function __construct($message, $hint = '', $code = 0, Exception $previous = null) {
 		$this->hint = $hint;
 		parent::__construct($message, $code, $previous);
 	}
@@ -106,12 +106,6 @@ class OC_Setup {
 						'hint' => $e->getHint()
 					);
 					return($error);
-				} catch (Exception $e) {
-					$error[] = array(
-						'error' => $e->getMessage(),
-						'hint' => ''
-					);
-					return($error);
 				}
 			}
 			elseif($dbtype == 'pgsql') {
@@ -127,7 +121,7 @@ class OC_Setup {
 
 				try {
 					self::setupPostgreSQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $username);
-				} catch (Exception $e) {
+				} catch (DatabaseSetupException $e) {
 					$error[] = array(
 						'error' => $l->t('PostgreSQL username and/or password not valid'),
 						'hint' => $l->t('You need to enter either an existing account or the administrator.')
@@ -139,18 +133,21 @@ class OC_Setup {
 				$dbuser = $options['dbuser'];
 				$dbpass = $options['dbpass'];
 				$dbname = $options['dbname'];
-				$dbtablespace = $options['dbtablespace'];
+				if (array_key_exists('dbtablespace', $options)) {
+					$dbtablespace = $options['dbtablespace'];
+				} else {
+					$dbtablespace = 'USERS';
+				}
 				$dbhost = isset($options['dbhost'])?$options['dbhost']:'';
 				$dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_';
 
 				OC_Config::setValue('dbname', $dbname);
-				OC_Config::setValue('dbtablespace', $dbtablespace);
 				OC_Config::setValue('dbhost', $dbhost);
 				OC_Config::setValue('dbtableprefix', $dbtableprefix);
 
 				try {
 					self::setupOCIDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $dbtablespace, $username);
-				} catch (Exception $e) {
+				} catch (DatabaseSetupException $e) {
 					$error[] = array(
 						'error' => $l->t('Oracle connection could not be established'),
 						'hint' => $e->getMessage().' Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
@@ -177,7 +174,7 @@ class OC_Setup {
 
 				try {
 					self::setupMSSQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix);
-				} catch (Exception $e) {
+				} catch (DatabaseSetupException $e) {
 					$error[] = array(
 						'error' => 'MS SQL username and/or password not valid',
 						'hint' => 'You need to enter either an existing account or the administrator.'
@@ -326,7 +323,13 @@ class OC_Setup {
 		$connection_string = "host='$e_host' dbname=postgres user='$e_user' password='$e_password'";
 		$connection = @pg_connect($connection_string);
 		if(!$connection) {
-			throw new Exception($l->t('PostgreSQL username and/or password not valid'));
+			// Try if we can connect to the DB with the specified name
+			$e_dbname = addslashes($dbname);
+			$connection_string = "host='$e_host' dbname='$e_dbname' user='$e_user' password='$e_password'";
+			$connection = @pg_connect($connection_string);
+
+			if(!$connection)
+				throw new DatabaseSetupException($l->t('PostgreSQL username and/or password not valid'));
 		}
 		$e_user = pg_escape_string($dbuser);
 		//check for roles creation rights in postgresql
@@ -371,7 +374,7 @@ class OC_Setup {
 		$connection_string = "host='$e_host' dbname='$e_dbname' user='$e_user' password='$e_password'";
 		$connection = @pg_connect($connection_string);
 		if(!$connection) {
-			throw new Exception($l->t('PostgreSQL username and/or password not valid'));
+			throw new DatabaseSetupException($l->t('PostgreSQL username and/or password not valid'));
 		}
 		$query = "select count(*) FROM pg_class WHERE relname='{$dbtableprefix}users' limit 1";
 		$result = pg_query($connection, $query);
@@ -446,7 +449,7 @@ class OC_Setup {
 	}
 
 	private static function setupOCIDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $dbtablespace,
-		$username) {
+			$username) {
 		$l = self::getTrans();
 		$e_host = addslashes($dbhost);
 		$e_dbname = addslashes($dbname);
@@ -461,9 +464,9 @@ class OC_Setup {
 		if(!$connection) {
 			$e = oci_error();
 			if (is_array ($e) && isset ($e['message'])) {
-				throw new Exception($e['message']);
+				throw new DatabaseSetupException($e['message']);
 			}
-			throw new Exception($l->t('Oracle username and/or password not valid'));
+			throw new DatabaseSetupException($l->t('Oracle username and/or password not valid'));
 		}
 		//check for roles creation rights in oracle
 
@@ -530,7 +533,7 @@ class OC_Setup {
 		}
 		$connection = @oci_connect($dbuser, $dbpass, $easy_connect_string);
 		if(!$connection) {
-			throw new Exception($l->t('Oracle username and/or password not valid'));
+			throw new DatabaseSetupException($l->t('Oracle username and/or password not valid'));
 		}
 		$query = "SELECT count(*) FROM user_tables WHERE table_name = :un";
 		$stmt = oci_parse($connection, $query);
@@ -641,7 +644,7 @@ class OC_Setup {
 			} else {
 				$entry = '';
 			}
-			throw new Exception($l->t('MS SQL username and/or password not valid: %s', array($entry)));
+			throw new DatabaseSetupException($l->t('MS SQL username and/or password not valid: %s', array($entry)));
 		}
 
 		OC_Config::setValue('dbuser', $dbuser);
diff --git a/lib/template.php b/lib/template.php
index 9467dedb62a..ae9ea187445 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -535,4 +535,25 @@ class OC_Template{
 		$content->printPage();
 		die();
 	}
+	
+	/**
+	 * print error page using Exception details
+	 * @param Exception $exception
+	 */
+	
+	public static function printExceptionErrorPage(Exception $exception) {
+		$error_msg = $exception->getMessage();
+		if ($exception->getCode()) {
+			$error_msg = '['.$exception->getCode().'] '.$error_msg;
+		}
+		$hint = $exception->getTraceAsString();
+		while (method_exists($exception,'previous') && $exception = $exception->previous()) {
+			$error_msg .= '<br/>Caused by: ';
+			if ($exception->getCode()) {
+				$error_msg .= '['.$exception->getCode().'] ';
+			}
+			$error_msg .= $exception->getMessage();
+		};
+		self::printErrorPage($error_msg, $hint);
+	}
 }
diff --git a/lib/user.php b/lib/user.php
index 503ac3f7493..06ea8e791dd 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -213,7 +213,7 @@ class OC_User {
 	 * Allowed characters in the username are: "a-z", "A-Z", "0-9" and "_.@-"
 	 */
 	public static function createUser($uid, $password) {
-		self::getManager()->createUser($uid, $password);
+		return self::getManager()->createUser($uid, $password);
 	}
 
 	/**
diff --git a/lib/user/user.php b/lib/user/user.php
index f9466b71499..55d7848a979 100644
--- a/lib/user/user.php
+++ b/lib/user/user.php
@@ -131,10 +131,10 @@ class User {
 	 * @return bool
 	 */
 	public function setPassword($password, $recoveryPassword) {
+		if ($this->emitter) {
+			$this->emitter->emit('\OC\User', 'preSetPassword', array($this, $password, $recoveryPassword));
+		}
 		if ($this->backend->implementsActions(\OC_USER_BACKEND_SET_PASSWORD)) {
-			if ($this->emitter) {
-				$this->emitter->emit('\OC\User', 'preSetPassword', array($this, $password, $recoveryPassword));
-			}
 			$result = $this->backend->setPassword($this->uid, $password);
 			if ($this->emitter) {
 				$this->emitter->emit('\OC\User', 'postSetPassword', array($this, $password, $recoveryPassword));
diff --git a/lib/util.php b/lib/util.php
index 95af22ed0ee..ddef0c63c55 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -833,6 +833,26 @@ class OC_Util {
 	}
 
 	/**
+	 * Clear the opcode cache if one exists
+	 * This is necessary for writing to the config file
+	 * in case the opcode cache doesn't revalidate files
+	 */
+	public static function clearOpcodeCache() {
+		// APC
+		if (function_exists('apc_clear_cache')) {
+			apc_clear_cache();
+		}
+		// Zend Opcache
+		if (function_exists('accelerator_reset')) {
+			accelerator_reset();
+		}
+		// XCache
+		if (function_exists('xcache_clear_cache')) {
+			xcache_clear_cache(XC_TYPE_VAR, 0);
+		}
+	}
+
+	/**
 	 * Normalize a unicode string
 	 * @param string $value a not normalized string
 	 * @return bool|string
diff --git a/public.php b/public.php
index 3d7fd378af4..0154b59cce3 100644
--- a/public.php
+++ b/public.php
@@ -1,21 +1,31 @@
 <?php
 $RUNTIME_NOAPPS = true;
-require_once 'lib/base.php';
-OC::checkMaintenanceMode();
-if (!isset($_GET['service'])) {
-	header('HTTP/1.0 404 Not Found');
-	exit;
-}
-$file = OCP\CONFIG::getAppValue('core', 'public_' . strip_tags($_GET['service']));
-if(is_null($file)) {
-	header('HTTP/1.0 404 Not Found');
-	exit;
-}
 
-$parts=explode('/', $file, 2);
-$app=$parts[0];
+try {
 
-OC_Util::checkAppEnabled($app);
-OC_App::loadApp($app);
+	require_once 'lib/base.php';
+	OC::checkMaintenanceMode();
+	if (!isset($_GET['service'])) {
+		header('HTTP/1.0 404 Not Found');
+		exit;
+	}
+	$file = OCP\CONFIG::getAppValue('core', 'public_' . strip_tags($_GET['service']));
+	if(is_null($file)) {
+		header('HTTP/1.0 404 Not Found');
+		exit;
+	}
 
-require_once OC_App::getAppPath($app) .'/'. $parts[1];
+	$parts=explode('/', $file, 2);
+	$app=$parts[0];
+
+	OC_Util::checkAppEnabled($app);
+	OC_App::loadApp($app);
+
+	require_once OC_App::getAppPath($app) .'/'. $parts[1];
+
+} 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);
+	OC_Template::printExceptionErrorPage($ex);
+}
\ No newline at end of file
diff --git a/remote.php b/remote.php
index 7738de04f60..ec0f2ecef72 100644
--- a/remote.php
+++ b/remote.php
@@ -1,40 +1,49 @@
 <?php
 $RUNTIME_NOAPPS = true;
-require_once 'lib/base.php';
-$path_info = OC_Request::getPathInfo();
-if ($path_info === false || $path_info === '') {
-	OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
-	exit;
-}
-if (!$pos = strpos($path_info, '/', 1)) {
-	$pos = strlen($path_info);
-}
-$service=substr($path_info, 1, $pos-1);
 
-$file = OC_AppConfig::getValue('core', 'remote_' . $service);
+try {
 
-if(is_null($file)) {
-	OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
-	exit;
-}
+	require_once 'lib/base.php';
+	$path_info = OC_Request::getPathInfo();
+	if ($path_info === false || $path_info === '') {
+		OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
+		exit;
+	}
+	if (!$pos = strpos($path_info, '/', 1)) {
+		$pos = strlen($path_info);
+	}
+	$service=substr($path_info, 1, $pos-1);
 
-$file=ltrim($file, '/');
+	$file = OC_AppConfig::getValue('core', 'remote_' . $service);
 
-$parts=explode('/', $file, 2);
-$app=$parts[0];
-switch ($app) {
-	case 'core':
-		$file =  OC::$SERVERROOT .'/'. $file;
-		break;
-	default:
-		OC_Util::checkAppEnabled($app);
-		OC_App::loadApp($app);
-		if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-			$file = OC_App::getAppPath($app) .'/'. $parts[1];
-		}else{
-			$file = '/' . OC_App::getAppPath($app) .'/'. $parts[1];
-		}
-		break;
-}
-$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
-require_once $file;
+	if(is_null($file)) {
+		OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
+		exit;
+	}
+
+	$file=ltrim($file, '/');
+
+	$parts=explode('/', $file, 2);
+	$app=$parts[0];
+	switch ($app) {
+		case 'core':
+			$file =  OC::$SERVERROOT .'/'. $file;
+			break;
+		default:
+			OC_Util::checkAppEnabled($app);
+			OC_App::loadApp($app);
+			if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+				$file = OC_App::getAppPath($app) .'/'. $parts[1];
+			}else{
+				$file = '/' . OC_App::getAppPath($app) .'/'. $parts[1];
+			}
+			break;
+	}
+	$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
+	require_once $file;
+
+} catch (Exception $ex) {
+	OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
+	\OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL);
+	OC_Template::printExceptionErrorPage($ex);
+}
\ No newline at end of file
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index cb66c57c743..d409904ebc7 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -7,38 +7,58 @@ OC_JSON::checkLoggedIn();
 // Manually load apps to ensure hooks work correctly (workaround for issue 1503)
 OC_APP::loadApps();
 
-$username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
-$password = isset($_POST["password"]) ? $_POST["password"] : null;
-$oldPassword=isset($_POST["oldpassword"])?$_POST["oldpassword"]:'';
-$recoveryPassword=isset($_POST["recoveryPassword"])?$_POST["recoveryPassword"]:null;
+$username = isset($_POST['username']) ? $_POST['username'] : OC_User::getUser();
+$password = isset($_POST['password']) ? $_POST['password'] : null;
+$oldPassword = isset($_POST['oldpassword']) ? $_POST['oldpassword'] : '';
+$recoveryPassword = isset($_POST['recoveryPassword']) ? $_POST['recoveryPassword'] : null;
 
 $userstatus = null;
-if(OC_User::isAdminUser(OC_User::getUser())) {
+if (OC_User::isAdminUser(OC_User::getUser())) {
 	$userstatus = 'admin';
 }
-if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
+if (OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
 	$userstatus = 'subadmin';
 }
-if(OC_User::getUser() === $username && OC_User::checkPassword($username, $oldPassword)) {
+if (OC_User::getUser() === $username && OC_User::checkPassword($username, $oldPassword)) {
 	$userstatus = 'user';
 }
 
-if(is_null($userstatus)) {
-	OC_JSON::error( array( "data" => array( "message" => "Authentication error" )));
+if (is_null($userstatus)) {
+	OC_JSON::error(array('data' => array('message' => 'Authentication error')));
 	exit();
 }
 
-$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username);
-$recoveryAdminEnabled = OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' );
-$recoveryEnabledForUser = $util->recoveryEnabledForUser();
+if (\OCP\App::isEnabled('files_encryption') && $userstatus !== 'user') {
+	//handle the recovery case
+	$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username);
+	$recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
 
-if ($recoveryAdminEnabled && $recoveryEnabledForUser && $recoveryPassword == '') {
-	OC_JSON::error(array("data" => array( "message" => "Please provide a admin recovery password, otherwise all user data will be lost" )));
-}elseif ( $recoveryPassword && ! $util->checkRecoveryPassword($recoveryPassword) ) {
-	OC_JSON::error(array("data" => array( "message" => "Wrong admin recovery password. Please check the password and try again." )));
-}elseif(!is_null($password) && OC_User::setPassword( $username, $password, $recoveryPassword )) {
-	OC_JSON::success(array("data" => array( "username" => $username )));
-}
-else{
-	OC_JSON::error(array("data" => array( "message" => "Unable to change password" )));
+	$validRecoveryPassword = false;
+	$recoveryPasswordSupported = false;
+	if ($recoveryAdminEnabled) {
+		$validRecoveryPassword = $util->checkRecoveryPassword($recoveryPassword);
+		$recoveryEnabledForUser = $util->recoveryEnabledForUser();
+	}
+
+	if ($recoveryEnabledForUser && $recoveryPassword === '') {
+		OC_JSON::error(array('data' => array('message' => 'Please provide a admin recovery password, otherwise all user data will be lost')));
+	} elseif ($recoveryEnabledForUser && ! $validRecoveryPassword) {
+		OC_JSON::error(array('data' => array('message' => 'Wrong admin recovery password. Please check the password and try again.')));
+	} else { // now we know that everything is fine regarding the recovery password, let's try to change the password
+	$result = OC_User::setPassword($username, $password, $recoveryPassword);
+	if (!$result && $recoveryPasswordSupported) {
+		OC_JSON::error(array("data" => array( "message" => "Back-end doesn't support password change, but the users encryption key was successfully updated." )));
+	} elseif (!$result && !$recoveryPasswordSupported) {
+		OC_JSON::error(array("data" => array( "message" => "Unable to change password" )));
+	} else {
+		OC_JSON::success(array("data" => array( "username" => $username )));
+	}
+
+	}
+} else { // if user changes his own password or if encryption is disabled, proceed
+	if (!is_null($password) && OC_User::setPassword($username, $password)) {
+		OC_JSON::success(array('data' => array('username' => $username)));
+	} else {
+		OC_JSON::error(array('data' => array('message' => 'Unable to change password')));
+	}
 }
diff --git a/settings/ajax/removeuser.php b/settings/ajax/removeuser.php
index bf3a34f1472..8732c6518a8 100644
--- a/settings/ajax/removeuser.php
+++ b/settings/ajax/removeuser.php
@@ -21,5 +21,6 @@ if( OC_User::deleteUser( $username )) {
 	OC_JSON::success(array("data" => array( "username" => $username )));
 }
 else{
+	$l = OC_L10N::get('core');
 	OC_JSON::error(array("data" => array( "message" => $l->t("Unable to delete user") )));
 }
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 950e8929012..3c406109a1f 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -61,7 +61,13 @@ select.quota.active { background: #fff; }
 /* APPS */
 .appinfo { margin: 1em; }
 h3 { font-size: 1.4em; font-weight: bold; }
-ul.applist li { height: 2.2em; padding: 0.2em 0.2em 0.2em 0.8em !important; }
+ul.applist a {
+	height: 2.2em;
+	padding: 0.2em 0.2em 0.2em 0.8em !important;
+}
+ul.applist .app-external {
+	width: 100%;
+}
 li { color:#888; }
 li.active { color:#000; }
 small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 4px;}
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index a69bc9bed5a..db79ae2b093 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -81,9 +81,9 @@
 "Forum" => "منتدى",
 "Bugtracker" => "تعقب علة",
 "Commercial Support" => "دعم تجاري",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "تم إستهلاك <strong>%s</strong> من المتوفر <strong>%s</strong>",
 "Get the apps to sync your files" => "احصل على التطبيقات لمزامنة ملفاتك",
 "Show First Run Wizard again" => "ابدأ خطوات بداية التشغيل من جديد",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "تم إستهلاك <strong>%s</strong> من المتوفر <strong>%s</strong>",
 "Password" => "كلمة المرور",
 "Your password was changed" => "لقد تم تغيير كلمة السر",
 "Unable to change your password" => "لم يتم تعديل كلمة السر بنجاح",
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index a1e724aa967..8c25913fc1c 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -39,8 +39,8 @@
 "Forum" => "ফোরাম",
 "Bugtracker" => "বাগট্র্যাকার",
 "Commercial Support" => "বাণিজ্যিক সাপোর্ট",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "আপনি ব্যবহার করছেন  <strong>%s</strong>, সুলভ  <strong>%s</strong> এর মধ্যে।",
 "Show First Run Wizard again" => "প্রথমবার চালানোর যাদুকর পূনরায় প্রদর্শন কর",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "আপনি ব্যবহার করছেন  <strong>%s</strong>, সুলভ  <strong>%s</strong> এর মধ্যে।",
 "Password" => "কূটশব্দ",
 "Your password was changed" => "আপনার কূটশব্দটি পরিবর্তন করা হয়েছে ",
 "Unable to change your password" => "আপনার কূটশব্দটি পরিবর্তন করতে সক্ষম নয়",
diff --git a/settings/l10n/bs.php b/settings/l10n/bs.php
new file mode 100644
index 00000000000..774f081673d
--- /dev/null
+++ b/settings/l10n/bs.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Saving..." => "Spašavam..."
+);
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 769c25d7bff..201c15536ac 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -82,9 +82,9 @@
 "Forum" => "Fòrum",
 "Bugtracker" => "Seguiment d'errors",
 "Commercial Support" => "Suport comercial",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Heu utilitzat <strong>%s</strong> d'un total disponible de <strong>%s</strong>",
 "Get the apps to sync your files" => "Obtén les aplicacions per sincronitzar fitxers",
 "Show First Run Wizard again" => "Torna a mostrar l'assistent de primera execució",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Heu utilitzat <strong>%s</strong> d'un total disponible de <strong>%s</strong>",
 "Password" => "Contrasenya",
 "Your password was changed" => "La seva contrasenya s'ha canviat",
 "Unable to change your password" => "No s'ha pogut canviar la contrasenya",
@@ -102,6 +102,7 @@
 "Login Name" => "Nom d'accés",
 "Create" => "Crea",
 "Admin Recovery Password" => "Recuperació de contrasenya d'administrador",
+"Enter the recovery password in order to recover the users files during password change" => "Escriviu la contrasenya de recuperació per a poder recuperar els fitxers dels usuaris en canviar la contrasenya",
 "Default Storage" => "Emmagatzemament per defecte",
 "Unlimited" => "Il·limitat",
 "Other" => "Un altre",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index fdd38e7bb2a..3906c2f7187 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -82,9 +82,9 @@
 "Forum" => "Fórum",
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Placená podpora",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Používáte <strong>%s</strong> z <strong>%s</strong> dostupných",
 "Get the apps to sync your files" => "Získat aplikace pro synchronizaci vašich souborů",
 "Show First Run Wizard again" => "Znovu zobrazit průvodce prvním spuštěním",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Používáte <strong>%s</strong> z <strong>%s</strong> dostupných",
 "Password" => "Heslo",
 "Your password was changed" => "Vaše heslo bylo změněno",
 "Unable to change your password" => "Vaše heslo nelze změnit",
@@ -102,6 +102,7 @@
 "Login Name" => "Přihlašovací jméno",
 "Create" => "Vytvořit",
 "Admin Recovery Password" => "Heslo obnovy správce",
+"Enter the recovery password in order to recover the users files during password change" => "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesla",
 "Default Storage" => "Výchozí úložiště",
 "Unlimited" => "Neomezeně",
 "Other" => "Jiný",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index a01a90337da..8e9d682ab78 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -82,9 +82,9 @@
 "Forum" => "Forum",
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Kommerciel support",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har brugt <strong>%s</strong> af den tilgængelige <strong>%s</strong>",
 "Get the apps to sync your files" => "Hent applikationerne for at synkronisere dine filer",
 "Show First Run Wizard again" => "Vis Første Kørsels Guiden igen.",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har brugt <strong>%s</strong> af den tilgængelige <strong>%s</strong>",
 "Password" => "Kodeord",
 "Your password was changed" => "Din adgangskode blev ændret",
 "Unable to change your password" => "Ude af stand til at ændre dit kodeord",
@@ -101,6 +101,8 @@
 "Use this address to connect to your ownCloud in your file manager" => "Brug denne adresse til at oprette forbindelse til din ownCloud i din filstyring",
 "Login Name" => "Loginnavn",
 "Create" => "Ny",
+"Admin Recovery Password" => "Administrator gendannelse kodeord",
+"Enter the recovery password in order to recover the users files during password change" => "Indtast et gendannelse kodeord for, at kunne gendanne brugerens filer ved ændring af kodeord",
 "Default Storage" => "Standard opbevaring",
 "Unlimited" => "Ubegrænset",
 "Other" => "Andet",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 928130f398e..3722d5db0c9 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -82,9 +82,9 @@
 "Forum" => "Forum",
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Kommerzieller Support",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s<strong>",
 "Get the apps to sync your files" => "Lade die Apps zur Synchronisierung Deiner Daten herunter",
 "Show First Run Wizard again" => "Erstinstallation erneut durchführen",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s<strong>",
 "Password" => "Passwort",
 "Your password was changed" => "Dein Passwort wurde geändert.",
 "Unable to change your password" => "Passwort konnte nicht geändert werden",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index f7f53239749..c7846f79b30 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -82,9 +82,9 @@
 "Forum" => "Forum",
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Kommerzieller Support",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>",
 "Get the apps to sync your files" => "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
 "Show First Run Wizard again" => "Den Einrichtungsassistenten erneut anzeigen",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>",
 "Password" => "Passwort",
 "Your password was changed" => "Ihr Passwort wurde geändert.",
 "Unable to change your password" => "Das Passwort konnte nicht geändert werden",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 3558ae72988..6c07c9d8b48 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -82,9 +82,9 @@
 "Forum" => "Φόρουμ",
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Εμπορική Υποστήριξη",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Χρησιμοποιήσατε <strong>%s</strong> από διαθέσιμα <strong>%s</strong>",
 "Get the apps to sync your files" => "Λήψη της εφαρμογής για συγχρονισμό των αρχείων σας",
 "Show First Run Wizard again" => "Προβολή Πρώτης Εκτέλεσης Οδηγού πάλι",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Χρησιμοποιήσατε <strong>%s</strong> από διαθέσιμα <strong>%s</strong>",
 "Password" => "Συνθηματικό",
 "Your password was changed" => "Το συνθηματικό σας έχει αλλάξει",
 "Unable to change your password" => "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης",
@@ -101,6 +101,7 @@
 "Use this address to connect to your ownCloud in your file manager" => "Χρήση αυτής της διεύθυνσης για σύνδεση στο ownCloud με τον διαχειριστή αρχείων σας",
 "Login Name" => "Όνομα Σύνδεσης",
 "Create" => "Δημιουργία",
+"Admin Recovery Password" => "Κωδικός Επαναφοράς Διαχειριστή ",
 "Default Storage" => "Προκαθορισμένη Αποθήκευση ",
 "Unlimited" => "Απεριόριστο",
 "Other" => "Άλλο",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 137d3c8aff7..2204f10dee2 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -82,9 +82,9 @@
 "Forum" => "Foro",
 "Bugtracker" => "Rastreador de fallos",
 "Commercial Support" => "Soporte comercial",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles",
 "Get the apps to sync your files" => "Obtener las aplicaciones para sincronizar sus archivos",
 "Show First Run Wizard again" => "Mostrar asistente para iniciar otra vez",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles",
 "Password" => "Contraseña",
 "Your password was changed" => "Su contraseña ha sido cambiada",
 "Unable to change your password" => "No se ha podido cambiar su contraseña",
@@ -102,6 +102,7 @@
 "Login Name" => "Nombre de usuario",
 "Create" => "Crear",
 "Admin Recovery Password" => "Recuperación de la contraseña de administración",
+"Enter the recovery password in order to recover the users files during password change" => "Introduzca la contraseña de recuperación para recuperar los archivos de usuarios durante el cambio de contraseña.",
 "Default Storage" => "Almacenamiento predeterminado",
 "Unlimited" => "Ilimitado",
 "Other" => "Otro",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index f7eb7dd5c2d..9ca0e68aa35 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -82,9 +82,9 @@
 "Forum" => "Foro",
 "Bugtracker" => "Informar errores",
 "Commercial Support" => "Soporte comercial",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Usaste  <strong>%s</strong>  de los  <strong>%s</strong>  disponibles",
 "Get the apps to sync your files" => "Obtené aplicaciones para sincronizar tus archivos",
 "Show First Run Wizard again" => "Mostrar de nuevo el asistente de primera ejecución",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Usaste  <strong>%s</strong>  de los  <strong>%s</strong>  disponibles",
 "Password" => "Contraseña",
 "Your password was changed" => "Tu contraseña fue cambiada",
 "Unable to change your password" => "No fue posible cambiar tu contraseña",
@@ -101,6 +101,8 @@
 "Use this address to connect to your ownCloud in your file manager" => "Utiliza esta dirección para conectarte con ownCloud en tu Administrador de Archivos",
 "Login Name" => "Nombre de ",
 "Create" => "Crear",
+"Admin Recovery Password" => "Recuperación de contraseña de administrador",
+"Enter the recovery password in order to recover the users files during password change" => "Ingresá la contraseña de recuperación para recuperar los archivos de usuario al cambiar contraseña",
 "Default Storage" => "Almacenamiento Predeterminado",
 "Unlimited" => "Ilimitado",
 "Other" => "Otros",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 8a9e237e120..ab9cda4b565 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -82,9 +82,9 @@
 "Forum" => "Foorum",
 "Bugtracker" => "Vigade nimekiri",
 "Commercial Support" => "Tasuline kasutajatugi",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Kasutad <strong>%s</strong> saadavalolevast <strong>%s</strong>",
 "Get the apps to sync your files" => "Hangi rakendusi failide sünkroniseerimiseks",
 "Show First Run Wizard again" => "Näita veelkord Esmase Käivituse Juhendajat",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Kasutad <strong>%s</strong> saadavalolevast <strong>%s</strong>",
 "Password" => "Parool",
 "Your password was changed" => "Sinu parooli on muudetud",
 "Unable to change your password" => "Sa ei saa oma parooli muuta",
@@ -102,6 +102,7 @@
 "Login Name" => "Kasutajanimi",
 "Create" => "Lisa",
 "Admin Recovery Password" => "Admin taasteparool",
+"Enter the recovery password in order to recover the users files during password change" => "Sisesta taasteparool kasutaja failide taastamiseks paroolivahetuse käigus",
 "Default Storage" => "Vaikimisi maht",
 "Unlimited" => "Piiramatult",
 "Other" => "Muu",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 9982e9af9a0..b7a6cacc474 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -81,9 +81,9 @@
 "Forum" => "Foroa",
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Babes komertziala",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik",
 "Get the apps to sync your files" => "Lortu aplikazioak zure fitxategiak sinkronizatzeko",
 "Show First Run Wizard again" => "Erakutsi berriz Lehenengo Aldiko Morroia",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik",
 "Password" => "Pasahitza",
 "Your password was changed" => "Zere pasahitza aldatu da",
 "Unable to change your password" => "Ezin izan da zure pasahitza aldatu",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index 1abb70f27a6..b415f2990d4 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -75,9 +75,9 @@
 "Forum" => "انجمن",
 "Bugtracker" => "ردیاب باگ ",
 "Commercial Support" => "پشتیبانی تجاری",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "شما استفاده کردید از <strong>%s</strong> از میزان در دسترس <strong>%s</strong>",
 "Get the apps to sync your files" => "برنامه ها را دریافت کنید تا فایل هایتان را همگام سازید",
 "Show First Run Wizard again" => "راهبری کمکی اجرای اول را دوباره نمایش بده",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "شما استفاده کردید از <strong>%s</strong> از میزان در دسترس <strong>%s</strong>",
 "Password" => "گذرواژه",
 "Your password was changed" => "رمز عبور شما تغییر یافت",
 "Unable to change your password" => "ناتوان در تغییر گذرواژه",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index f2d7d333589..38ba5629c8f 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -70,8 +70,8 @@
 "Forum" => "Keskustelupalsta",
 "Bugtracker" => "Ohjelmistovirheiden jäljitys",
 "Commercial Support" => "Kaupallinen tuki",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Käytössäsi on <strong>%s</strong>/<strong>%s</strong>",
 "Show First Run Wizard again" => "Näytä ensimmäisen käyttökerran avustaja uudelleen",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Käytössäsi on <strong>%s</strong>/<strong>%s</strong>",
 "Password" => "Salasana",
 "Your password was changed" => "Salasanasi vaihdettiin",
 "Unable to change your password" => "Salasanaasi ei voitu vaihtaa",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 2067fbc4c5d..5997ccbf24d 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -82,9 +82,9 @@
 "Forum" => "Forum",
 "Bugtracker" => "Suivi de bugs",
 "Commercial Support" => "Support commercial",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles",
 "Get the apps to sync your files" => "Obtenez les applications de synchronisation de vos fichiers",
 "Show First Run Wizard again" => "Revoir le premier lancement de l'installeur",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles",
 "Password" => "Mot de passe",
 "Your password was changed" => "Votre mot de passe a été changé",
 "Unable to change your password" => "Impossible de changer votre mot de passe",
@@ -102,6 +102,7 @@
 "Login Name" => "Nom de la connexion",
 "Create" => "Créer",
 "Admin Recovery Password" => "Récupération du mot de passe administrateur",
+"Enter the recovery password in order to recover the users files during password change" => "Entrer le mot de passe de récupération dans le but de récupérer les fichiers utilisateurs pendant le changement de mot de passe",
 "Default Storage" => "Support de stockage par défaut",
 "Unlimited" => "Illimité",
 "Other" => "Autre",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 05f3dc07c4a..51e8ee95e0e 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -82,9 +82,9 @@
 "Forum" => "Foro",
 "Bugtracker" => "Seguemento de fallos",
 "Commercial Support" => "Asistencia comercial",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ten en uso <strong>%s</strong> do total dispoñíbel de <strong>%s</strong>",
 "Get the apps to sync your files" => "Obteña os aplicativos para sincronizar os seus ficheiros",
 "Show First Run Wizard again" => "Amosar o axudante da primeira execución outra vez",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ten en uso <strong>%s</strong> do total dispoñíbel de <strong>%s</strong>",
 "Password" => "Contrasinal",
 "Your password was changed" => "O seu contrasinal foi cambiado",
 "Unable to change your password" => "Non é posíbel cambiar o seu contrasinal",
@@ -94,14 +94,15 @@
 "Display Name" => "Amosar o nome",
 "Email" => "Correo",
 "Your email address" => "O seu enderezo de correo",
-"Fill in an email address to enable password recovery" => "Escriba un enderezo de correo para activar a recuperación do contrasinal",
+"Fill in an email address to enable password recovery" => "Escriba un enderezo de correo para activar o contrasinal de recuperación",
 "Language" => "Idioma",
 "Help translate" => "Axude na tradución",
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Utilice este enderezo para conectarse ao seu ownCloud co administrador de ficheiros",
 "Login Name" => "Nome de acceso",
 "Create" => "Crear",
-"Admin Recovery Password" => "Recuperación do contrasinal do administrador",
+"Admin Recovery Password" => "Contrasinal de recuperación do administrador",
+"Enter the recovery password in order to recover the users files during password change" => "Introduza o contrasinal de recuperación para recuperar os ficheiros dos usuarios durante o cambio de contrasinal",
 "Default Storage" => "Almacenamento predeterminado",
 "Unlimited" => "Sen límites",
 "Other" => "Outro",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index 77c6d37fbbe..b2edebe08f6 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -74,9 +74,9 @@
 "Forum" => "פורום",
 "Bugtracker" => "עוקב תקלות",
 "Commercial Support" => "תמיכה בתשלום",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> הזמינים לך",
 "Get the apps to sync your files" => "השג את האפליקציות על מנת לסנכרן את הקבצים שלך",
 "Show First Run Wizard again" => "הצגת אשף ההפעלה הראשונית שוב",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> הזמינים לך",
 "Password" => "סיסמא",
 "Your password was changed" => "הססמה שלך הוחלפה",
 "Unable to change your password" => "לא ניתן לשנות את הססמה שלך",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 550796c3c79..872e8f971da 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -82,9 +82,9 @@
 "Forum" => "Fórum",
 "Bugtracker" => "Hibabejelentések",
 "Commercial Support" => "Megvásárolható támogatás",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Az Ön tárterület-felhasználása jelenleg: <strong>%s</strong>. Maximálisan ennyi áll rendelkezésére: <strong>%s</strong>",
 "Get the apps to sync your files" => "Töltse le az állományok szinkronizációjához szükséges programokat",
 "Show First Run Wizard again" => "Nézzük meg újra az első bejelentkezéskori segítséget!",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Az Ön tárterület-felhasználása jelenleg: <strong>%s</strong>. Maximálisan ennyi áll rendelkezésére: <strong>%s</strong>",
 "Password" => "Jelszó",
 "Your password was changed" => "A jelszava megváltozott",
 "Unable to change your password" => "A jelszó nem változtatható meg",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index fb5ee229f15..02da3c3cf2c 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -81,9 +81,9 @@
 "Forum" => "Forum",
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Dukungan Komersial",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Anda telah menggunakan <strong>%s</strong> dari total <strong>%s</strong>",
 "Get the apps to sync your files" => "Dapatkan aplikasi untuk sinkronisasi berkas Anda",
 "Show First Run Wizard again" => "Tampilkan Penuntun Konfigurasi Awal",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Anda telah menggunakan <strong>%s</strong> dari total <strong>%s</strong>",
 "Password" => "Sandi",
 "Your password was changed" => "Sandi Anda telah diubah",
 "Unable to change your password" => "Gagal mengubah sandi Anda",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 38c22ea06de..3433f56f2df 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -82,9 +82,9 @@
 "Forum" => "Forum",
 "Bugtracker" => "Sistema di tracciamento bug",
 "Commercial Support" => "Supporto commerciale",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Hai utilizzato <strong>%s</strong> dei <strong>%s</strong> disponibili",
 "Get the apps to sync your files" => "Scarica le applicazioni per sincronizzare i tuoi file",
 "Show First Run Wizard again" => "Mostra nuovamente la procedura di primo avvio",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Hai utilizzato <strong>%s</strong> dei <strong>%s</strong> disponibili",
 "Password" => "Password",
 "Your password was changed" => "La tua password è cambiata",
 "Unable to change your password" => "Modifica password non riuscita",
@@ -102,6 +102,7 @@
 "Login Name" => "Nome utente",
 "Create" => "Crea",
 "Admin Recovery Password" => "Password di ripristino amministrativa",
+"Enter the recovery password in order to recover the users files during password change" => "Digita la password di ripristino per recuperare i file degli utenti durante la modifica della password.",
 "Default Storage" => "Archiviazione predefinita",
 "Unlimited" => "Illimitata",
 "Other" => "Altro",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index ad42d3f085b..ddff0f328a1 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -82,9 +82,9 @@
 "Forum" => "フォーラム",
 "Bugtracker" => "バグトラッカー",
 "Commercial Support" => "コマーシャルサポート",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "現在、<strong>%s</strong> / <strong>%s</strong> を利用しています",
 "Get the apps to sync your files" => "ファイルを同期するためのアプリを取得",
 "Show First Run Wizard again" => "初回ウィザードを再表示する",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "現在、<strong>%s</strong> / <strong>%s</strong> を利用しています",
 "Password" => "パスワード",
 "Your password was changed" => "パスワードを変更しました",
 "Unable to change your password" => "パスワードを変更することができません",
@@ -102,6 +102,7 @@
 "Login Name" => "ログイン名",
 "Create" => "作成",
 "Admin Recovery Password" => "管理者復旧パスワード",
+"Enter the recovery password in order to recover the users files during password change" => "パスワード変更の間のユーザーのファイルを回復するために、リカバリパスワードを入力してください",
 "Default Storage" => "デフォルトストレージ",
 "Unlimited" => "無制限",
 "Other" => "その他",
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index f6f4249e68f..4a118eb7851 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -82,9 +82,9 @@
 "Forum" => "ფორუმი",
 "Bugtracker" => "ბაგთრექერი",
 "Commercial Support" => "კომერციული მხარდაჭერა",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "თქვენ გამოყენებული გაქვთ <strong>%s</strong> –ი –<strong>%s<strong>–დან",
 "Get the apps to sync your files" => "აპლიკაცია ფაილების სინქრონიზაციისთვის",
 "Show First Run Wizard again" => "მაჩვენე თავიდან გაშვებული ვიზარდი",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "თქვენ გამოყენებული გაქვთ <strong>%s</strong> –ი –<strong>%s<strong>–დან",
 "Password" => "პაროლი",
 "Your password was changed" => "თქვენი პაროლი შეიცვალა",
 "Unable to change your password" => "თქვენი პაროლი არ შეიცვალა",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index 2a139a02562..c58a578cae8 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -45,9 +45,9 @@
 "Forum" => "포럼",
 "Bugtracker" => "버그 트래커",
 "Commercial Support" => "상업용 지원",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "현재 공간 <strong>%s</strong>/<strong>%s</strong>을(를) 사용 중입니다",
 "Get the apps to sync your files" => "앱을 이용하여 당신의 파일을 동기화 할 수 있습니다.",
 "Show First Run Wizard again" => "첫 실행 마법사 다시 보이기",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "현재 공간 <strong>%s</strong>/<strong>%s</strong>을(를) 사용 중입니다",
 "Password" => "암호",
 "Your password was changed" => "암호가 변경되었습니다",
 "Unable to change your password" => "암호를 변경할 수 없음",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index 5864a392ace..fd6c2090f55 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -81,9 +81,9 @@
 "Forum" => "Forums",
 "Bugtracker" => "Kļūdu sekotājs",
 "Commercial Support" => "Komerciālais atbalsts",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Jūs lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>",
 "Get the apps to sync your files" => "Saņem lietotnes, lai sinhronizētu savas datnes",
 "Show First Run Wizard again" => "Vēlreiz rādīt pirmās palaišanas vedni",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Jūs lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>",
 "Password" => "Parole",
 "Your password was changed" => "Jūru parole tika nomainīta",
 "Unable to change your password" => "Nevar nomainīt jūsu paroli",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 9f18bf472ac..b6182cc3080 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -82,9 +82,9 @@
 "Forum" => "Forum",
 "Bugtracker" => "Feilsporing",
 "Commercial Support" => "Kommersiell støtte",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har brukt <strong>%s</strong> av tilgjengelig <strong>%s</strong>",
 "Get the apps to sync your files" => "Få dine apps til å synkronisere dine filer",
 "Show First Run Wizard again" => "Vis \"Førstegangs veiveiseren\" på nytt",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har brukt <strong>%s</strong> av tilgjengelig <strong>%s</strong>",
 "Password" => "Passord",
 "Your password was changed" => "Passord har blitt endret",
 "Unable to change your password" => "Kunne ikke endre passordet ditt",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index bab1babd938..a2df948d13e 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -82,9 +82,9 @@
 "Forum" => "Forum",
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Commerciële ondersteuning",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Je hebt <strong>%s</strong> gebruikt van de beschikbare <strong>%s<strong>",
 "Get the apps to sync your files" => "Download de apps om bestanden te syncen",
 "Show First Run Wizard again" => "Toon de Eerste start Wizard opnieuw",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Je hebt <strong>%s</strong> gebruikt van de beschikbare <strong>%s<strong>",
 "Password" => "Wachtwoord",
 "Your password was changed" => "Je wachtwoord is veranderd",
 "Unable to change your password" => "Niet in staat om uw wachtwoord te wijzigen",
@@ -102,6 +102,7 @@
 "Login Name" => "Inlognaam",
 "Create" => "Creëer",
 "Admin Recovery Password" => "Beheer herstel wachtwoord",
+"Enter the recovery password in order to recover the users files during password change" => "Voer het herstel wachtwoord in om de gebruikersbestanden terug te halen bij wachtwoordwijziging",
 "Default Storage" => "Standaard Opslaglimiet",
 "Unlimited" => "Ongelimiteerd",
 "Other" => "Anders",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 3008873c861..61ece5823d8 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -82,9 +82,9 @@
 "Forum" => "Forum",
 "Bugtracker" => "Feilsporar",
 "Commercial Support" => "Betalt brukarstøtte",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har brukt <strong>%s</strong> av dine tilgjengelege <strong>%s</strong>",
 "Get the apps to sync your files" => "Få app-ar som kan synkronisera filene dine",
 "Show First Run Wizard again" => "Vis Oppstartvegvisaren igjen",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har brukt <strong>%s</strong> av dine tilgjengelege <strong>%s</strong>",
 "Password" => "Passord",
 "Your password was changed" => "Passordet ditt er endra",
 "Unable to change your password" => "Klarte ikkje endra passordet",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 908a930339d..ec99000b4d9 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -82,9 +82,9 @@
 "Forum" => "Forum",
 "Bugtracker" => "Zgłaszanie błędów",
 "Commercial Support" => "Wsparcie komercyjne",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Wykorzystujesz <strong>%s</strong> z dostępnych <strong>%s</strong>",
 "Get the apps to sync your files" => "Pobierz aplikacje żeby synchronizować swoje pliki",
 "Show First Run Wizard again" => "Uruchom ponownie kreatora pierwszego uruchomienia",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Wykorzystujesz <strong>%s</strong> z dostępnych <strong>%s</strong>",
 "Password" => "Hasło",
 "Your password was changed" => "Twoje hasło zostało zmienione",
 "Unable to change your password" => "Nie można zmienić hasła",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 824940da583..2ffa32f603c 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -82,9 +82,9 @@
 "Forum" => "Fórum",
 "Bugtracker" => "Rastreador de Bugs",
 "Commercial Support" => "Suporte Comercial",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Você usou <strong>%s</strong> do seu espaço de <strong>%s</strong>",
 "Get the apps to sync your files" => "Faça com que os apps sincronize seus arquivos",
 "Show First Run Wizard again" => "Mostrar este Assistente de novo",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Você usou <strong>%s</strong> do seu espaço de <strong>%s</strong>",
 "Password" => "Senha",
 "Your password was changed" => "Sua senha foi alterada",
 "Unable to change your password" => "Não é possivel alterar a sua senha",
@@ -102,6 +102,7 @@
 "Login Name" => "Nome de Login",
 "Create" => "Criar",
 "Admin Recovery Password" => "Recuperação da Senha do Administrador",
+"Enter the recovery password in order to recover the users files during password change" => "Digite a senha de recuperação para recuperar os arquivos dos usuários durante a mudança de senha.",
 "Default Storage" => "Armazenamento Padrão",
 "Unlimited" => "Ilimitado",
 "Other" => "Outro",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index c5fc1a00926..b810d51a2e2 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -82,9 +82,9 @@
 "Forum" => "Fórum",
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Suporte Comercial",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Usou <strong>%s</strong> do disponivel <strong>%s</strong>",
 "Get the apps to sync your files" => "Obtenha as aplicações para sincronizar os seus ficheiros",
 "Show First Run Wizard again" => "Mostrar novamente Wizard de Arranque Inicial",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Usou <strong>%s</strong> do disponivel <strong>%s</strong>",
 "Password" => "Password",
 "Your password was changed" => "A sua palavra-passe foi alterada",
 "Unable to change your password" => "Não foi possivel alterar a sua palavra-chave",
@@ -102,6 +102,7 @@
 "Login Name" => "Nome de utilizador",
 "Create" => "Criar",
 "Admin Recovery Password" => "Recuperar password de administrador",
+"Enter the recovery password in order to recover the users files during password change" => "Digite a senha de recuperação, a fim de recuperar os arquivos de usuários durante a mudança de senha",
 "Default Storage" => "Armazenamento Padrão",
 "Unlimited" => "Ilimitado",
 "Other" => "Outro",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index f48e0bae0ad..99fb14b4dff 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -56,8 +56,8 @@
 "Forum" => "Forum",
 "Bugtracker" => "Urmărire bug-uri",
 "Commercial Support" => "Suport comercial",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile",
 "Get the apps to sync your files" => "Ia acum aplicatia pentru sincronizarea fisierelor ",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile",
 "Password" => "Parolă",
 "Your password was changed" => "Parola a fost modificată",
 "Unable to change your password" => "Imposibil de-ați schimbat parola",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 1531f6a361f..3d852d3b20b 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -82,9 +82,9 @@
 "Forum" => "Форум",
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Коммерческая поддержка",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Вы использовали <strong>%s</strong> из доступных <strong>%s</strong>",
 "Get the apps to sync your files" => "Получить приложения для синхронизации ваших файлов",
 "Show First Run Wizard again" => "Показать помощник настройки",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Вы использовали <strong>%s</strong> из доступных <strong>%s</strong>",
 "Password" => "Пароль",
 "Your password was changed" => "Ваш пароль изменён",
 "Unable to change your password" => "Невозможно сменить пароль",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 5d8445b4b3b..595a75833a3 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -82,9 +82,9 @@
 "Forum" => "Fórum",
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Komerčná podpora",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Použili ste <strong>%s</strong> z <strong>%s</strong> dostupných ",
 "Get the apps to sync your files" => "Získať aplikácie na synchronizáciu Vašich súborov",
 "Show First Run Wizard again" => "Znovu zobraziť sprievodcu prvým spustením",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Použili ste <strong>%s</strong> z <strong>%s</strong> dostupných ",
 "Password" => "Heslo",
 "Your password was changed" => "Heslo bolo zmenené",
 "Unable to change your password" => "Nie je možné zmeniť vaše heslo",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 55d957cfa7d..413300abc56 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -82,9 +82,9 @@
 "Forum" => "Forum",
 "Bugtracker" => "Sledilnik hroščev",
 "Commercial Support" => "Podpora strankam",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Uporabljenega je <strong>%s</strong> od razpoložljivih <strong>%s</strong> prostora.",
 "Get the apps to sync your files" => "Pridobi programe za usklajevanje datotek",
 "Show First Run Wizard again" => "Zaženi čarovnika prvega zagona",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Uporabljenega je <strong>%s</strong> od razpoložljivih <strong>%s</strong> prostora.",
 "Password" => "Geslo",
 "Your password was changed" => "Geslo je spremenjeno",
 "Unable to change your password" => "Gesla ni mogoče spremeniti.",
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index 29e0661e443..8437c054da5 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -75,9 +75,9 @@
 "Forum" => "Форум",
 "Bugtracker" => "Праћење грешака",
 "Commercial Support" => "Комерцијална подршка",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Искористили сте <strong>%s</strong> од дозвољених <strong>%s</strong>",
 "Get the apps to sync your files" => "Преузмите апликације ради синхронизовања датотека",
 "Show First Run Wizard again" => "Поново прикажи чаробњак за прво покретање",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Искористили сте <strong>%s</strong> од дозвољених <strong>%s</strong>",
 "Password" => "Лозинка",
 "Your password was changed" => "Лозинка је промењена",
 "Unable to change your password" => "Не могу да изменим вашу лозинку",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index dca9692999b..0eae1907378 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -15,7 +15,7 @@
 "Admins can't remove themself from the admin group" => "Administratörer kan inte ta bort sig själva från admingruppen",
 "Unable to add user to group %s" => "Kan inte lägga till användare i gruppen %s",
 "Unable to remove user from group %s" => "Kan inte radera användare från gruppen %s",
-"Couldn't update app." => "Kunde inte uppdatera appen",
+"Couldn't update app." => "Kunde inte uppdatera appen.",
 "Update to {appversion}" => "Uppdatera till {appversion}",
 "Disable" => "Deaktivera",
 "Enable" => "Aktivera",
@@ -82,9 +82,9 @@
 "Forum" => "Forum",
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Kommersiell support",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>",
 "Get the apps to sync your files" => "Skaffa apparna för att synkronisera dina filer",
 "Show First Run Wizard again" => "Visa Första uppstarts-guiden igen",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>",
 "Password" => "Lösenord",
 "Your password was changed" => "Ditt lösenord har ändrats",
 "Unable to change your password" => "Kunde inte ändra ditt lösenord",
@@ -102,6 +102,7 @@
 "Login Name" => "Inloggningsnamn",
 "Create" => "Skapa",
 "Admin Recovery Password" => "Admin återställningslösenord",
+"Enter the recovery password in order to recover the users files during password change" => "Enter the recovery password in order to recover the users files during password change",
 "Default Storage" => "Förvald lagring",
 "Unlimited" => "Obegränsad",
 "Other" => "Annat",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 998e4577785..895e1c3e83e 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -62,8 +62,8 @@
 "Forum" => "กระดานสนทนา",
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "บริการลูกค้าแบบเสียค่าใช้จ่าย",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "คุณได้ใช้งานไปแล้ว <strong>%s</strong> จากจำนวนที่สามารถใช้ได้ <strong>%s</strong>",
 "Show First Run Wizard again" => "แสดงหน้าจอวิซาร์ดนำทางครั้งแรกอีกครั้ง",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "คุณได้ใช้งานไปแล้ว <strong>%s</strong> จากจำนวนที่สามารถใช้ได้ <strong>%s</strong>",
 "Password" => "รหัสผ่าน",
 "Your password was changed" => "รหัสผ่านของคุณถูกเปลี่ยนแล้ว",
 "Unable to change your password" => "ไม่สามารถเปลี่ยนรหัสผ่านของคุณได้",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index e694b627afd..1fcf6ac6c0e 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -82,9 +82,9 @@
 "Forum" => "Forum",
 "Bugtracker" => "Hata Takip Sistemi",
 "Commercial Support" => "Ticari Destek",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Kullandığınız:<strong>%s</strong> seçilebilecekler: <strong>%s</strong>",
 "Get the apps to sync your files" => "Dosyalarınızı senkronize etmek için uygulamayı indirin",
 "Show First Run Wizard again" => "İlk Çalıştırma Sihirbazını yeniden göster",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Kullandığınız:<strong>%s</strong> seçilebilecekler: <strong>%s</strong>",
 "Password" => "Parola",
 "Your password was changed" => "Şifreniz değiştirildi",
 "Unable to change your password" => "Parolanız değiştirilemiyor",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index d2b51e853f2..ca5a5d8a072 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -81,9 +81,9 @@
 "Forum" => "Форум",
 "Bugtracker" => "БагТрекер",
 "Commercial Support" => "Комерційна підтримка",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ви використали <strong>%s</strong> із доступних <strong>%s</strong>",
 "Get the apps to sync your files" => "Отримати додатки для синхронізації ваших файлів",
 "Show First Run Wizard again" => "Показувати Майстер Налаштувань знову",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ви використали <strong>%s</strong> із доступних <strong>%s</strong>",
 "Password" => "Пароль",
 "Your password was changed" => "Ваш пароль змінено",
 "Unable to change your password" => "Не вдалося змінити Ваш пароль",
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index c9f7cd8633d..d7b4b81e113 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -62,9 +62,9 @@
 "Forum" => "Diễn đàn",
 "Bugtracker" => "Hệ ghi nhận lỗi",
 "Commercial Support" => "Hỗ trợ có phí",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Bạn đã sử dụng <strong>%s </ strong> có sẵn <strong> %s </ strong>",
 "Get the apps to sync your files" => "Nhận ứng dụng để đồng bộ file của bạn",
 "Show First Run Wizard again" => "Hiện lại việc chạy đồ thuật khởi đầu",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Bạn đã sử dụng <strong>%s </ strong> có sẵn <strong> %s </ strong>",
 "Password" => "Mật khẩu",
 "Your password was changed" => "Mật khẩu của bạn đã được thay đổi.",
 "Unable to change your password" => "Không thể đổi mật khẩu",
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
index 6e88d71fe44..67946587e56 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -79,9 +79,9 @@
 "Forum" => "论坛",
 "Bugtracker" => "Bug追踪者",
 "Commercial Support" => "商业支持",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "您已使用<strong>%s</strong>/<strong>%s</strong>",
 "Get the apps to sync your files" => "获取应用并同步您的文件",
 "Show First Run Wizard again" => "再次显示首次运行向导",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "您已使用<strong>%s</strong>/<strong>%s</strong>",
 "Password" => "密码",
 "Your password was changed" => "您的密码以变更",
 "Unable to change your password" => "不能改变你的密码",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index bb2553e4c67..248fce04eb2 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -82,9 +82,9 @@
 "Forum" => "论坛",
 "Bugtracker" => "问题跟踪器",
 "Commercial Support" => "商业支持",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "你已使用 <strong>%s</strong>，有效空间 <strong>%s</strong>",
 "Get the apps to sync your files" => "安装应用进行文件同步",
 "Show First Run Wizard again" => "再次显示首次运行向导",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "你已使用 <strong>%s</strong>，有效空间 <strong>%s</strong>",
 "Password" => "密码",
 "Your password was changed" => "密码已修改",
 "Unable to change your password" => "无法修改密码",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index aca20f15e5c..ae52b170867 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -82,9 +82,9 @@
 "Forum" => "論壇",
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "商用支援",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "您已經使用了 <strong>%s</strong> ，目前可用空間為 <strong>%s</strong>",
 "Get the apps to sync your files" => "下載應用程式來同步您的檔案",
 "Show First Run Wizard again" => "再次顯示首次使用精靈",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "您已經使用了 <strong>%s</strong> ，目前可用空間為 <strong>%s</strong>",
 "Password" => "密碼",
 "Your password was changed" => "你的密碼已更改",
 "Unable to change your password" => "無法變更您的密碼",
diff --git a/settings/personal.php b/settings/personal.php
index cab6e56dada..cb411cacc5b 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -60,7 +60,7 @@ usort( $languages, function ($a, $b) {
 
 //links to clients
 $clients = array(
-	'desktop' => OC_Config::getValue('customclient_desktop', 'http://owncloud.org/sync-clients/'),
+	'desktop' => OC_Config::getValue('customclient_desktop', OC_Defaults::getSyncClientUrl()),
 	'android' => OC_Config::getValue('customclient_android', 'https://play.google.com/store/apps/details?id=com.owncloud.android'),
 	'ios'     => OC_Config::getValue('customclient_ios', 'https://itunes.apple.com/us/app/owncloud/id543672169?mt=8')
 );
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 28254b7aa18..1ed3f6ef47f 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -230,10 +230,12 @@ endfor;?>
 
 </fieldset>
 
-
-<fieldset class="personalblock">
+<fieldset class="personalblock credits-footer">
+<?php if (OC_Util::getEditionString() === ''): ?>
 	<legend><strong><?php p($l->t('Version'));?></strong></legend>
 	<strong>ownCloud</strong> <?php p(OC_Util::getVersionString()); ?> <?php p(OC_Util::getEditionString()); ?><br/>
 	<?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
+<?php else: ?>
+    <p>© 2013 <a href="<?php p(OC_Defaults::getBaseUrl()); ?>" target="_blank"><?php p(OC_Defaults::getEntity()); ?></a> – <?php p(OC_Defaults::getSlogan()); ?></p>
+<?php endif; ?>
 </fieldset>
-
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index d3639cbab34..0903b9bd5c4 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -7,11 +7,12 @@
 	src="<?php print_unescaped(OC_Helper::linkToRoute('apps_custom'));?>?appid=<?php p($_['appid']); ?>"></script>
  <script type="text/javascript" src="<?php print_unescaped(OC_Helper::linkTo('settings/js', 'apps.js'));?>"></script>
 
-<div id="controls">
-	<a class="button" target="_blank" href="http://owncloud.org/dev"><?php p($l->t('Add your App'));?></a>
-	<a class="button" target="_blank" href="http://apps.owncloud.com"><?php p($l->t('More Apps'));?></a>
-</div>
-<ul id="leftcontent" class="applist hascontrols">
+
+<ul id="leftcontent" class="applist">
+	<li>
+		<a class="app-external" target="_blank" href="http://owncloud.org/dev"><?php p($l->t('Add your App'));?> …</a>
+	</li>
+
 	<?php foreach($_['apps'] as $app):?>
 	<li <?php if($app['active']) print_unescaped('class="active"')?> data-id="<?php p($app['id']) ?>"
 		<?php if ( isset( $app['ocs_id'] ) ) { print_unescaped("data-id-ocs=\"{".OC_Util::sanitizeHTML($app['ocs_id'])."}\""); } ?>
@@ -22,6 +23,10 @@
 			print_unescaped('<small class="'.OC_Util::sanitizeHTML($app['internalclass']).' list">'.OC_Util::sanitizeHTML($app['internallabel']).'</small>') ?>
 	</li>
 	<?php endforeach;?>
+
+	<li>
+		<a class="app-external" target="_blank" href="http://apps.owncloud.com"><?php p($l->t('More Apps'));?> …</a>
+	</li>
 </ul>
 <div id="rightcontent">
 	<div class="appinfo">
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index f0002c505c8..a9457399d5d 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -4,12 +4,6 @@
  * See the COPYING-README file.
  */?>
 
-<div id="quota" class="personalblock"><div style="width:<?php p($_['usage_relative']);?>%;">
-	<p id="quotatext"><?php print_unescaped($l->t('You have used <strong>%s</strong> of the available <strong>%s</strong>',
-		array($_['usage'], $_['total_space'])));?></p>
-</div></div>
-
-
 
 <div class="clientsbox">
 	<h2><?php p($l->t('Get the apps to sync your files'));?></h2>
@@ -28,6 +22,15 @@
 </div>
 
 
+<div id="quota" class="personalblock">
+	<div style="width:<?php p($_['usage_relative']);?>%;">
+		<p id="quotatext">
+			<?php print_unescaped($l->t('You have used <strong>%s</strong> of the available <strong>%s</strong>',
+			array($_['usage'], $_['total_space'])));?>
+		</p>
+	</div>
+</div>
+
 
 <?php
 if($_['passwordChangeSupported']) {
@@ -91,8 +94,10 @@ if($_['passwordChangeSupported']) {
 			<option value="<?php p($language['code']);?>"><?php p($language['name']);?></option>
 		<?php endforeach;?>
 		</select>
+		<?php if (OC_Util::getEditionString() === ''): ?>
 		<a href="https://www.transifex.net/projects/p/owncloud/team/<?php p($_['activelanguage']['code']);?>/"
 			target="_blank"><em><?php p($l->t('Help translate'));?></em></a>
+		<?php endif; ?>
 	</fieldset>
 </form>
 
@@ -106,12 +111,13 @@ if($_['passwordChangeSupported']) {
 	print_unescaped($form);
 };?>
 
-
-<fieldset class="personalblock">
+<fieldset class="personalblock credits-footer">
+<?php if (OC_Util::getEditionString() === ''): ?>
 	<legend><strong><?php p($l->t('Version'));?></strong></legend>
 	<strong>ownCloud</strong> <?php p(OC_Util::getVersionString()); ?>
 	<?php p(OC_Util::getEditionString()); ?> <br />
 	<?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?>
+<?php else: ?>
+    <p>© 2013 <a href="<?php p(OC_Defaults::getBaseUrl()); ?>" target="_blank"><?php p(OC_Defaults::getEntity()); ?></a> – <?php p(OC_Defaults::getSlogan()); ?></p>
+<?php endif; ?>
 </fieldset>
-
-
diff --git a/settings/templates/users.php b/settings/templates/users.php
index a6df85983dd..b0637814f5d 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -31,7 +31,11 @@ $_['subadmingroups'] = array_flip($items);
 	</form>
 	<?php if((bool)$_['recoveryAdminEnabled']): ?>
 	<div class="recoveryPassword">
-	<input id="recoveryPassword" type="password" placeholder="<?php p($l->t('Admin Recovery Password'))?>" />
+	<input id="recoveryPassword"
+		   type="password"
+		   placeholder="<?php p($l->t('Admin Recovery Password'))?>"
+		   title="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"
+		   alt="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"/>
 	</div>
 	<?php endif; ?>
 	<div class="quota">
diff --git a/status.php b/status.php
index 9d6ac87c671..bac01c11b28 100644
--- a/status.php
+++ b/status.php
@@ -23,13 +23,20 @@
 
 $RUNTIME_NOAPPS = true; //no apps, yet
 
-require_once 'lib/base.php';
+try {
 
-if(OC_Config::getValue('installed')==1) $installed='true'; else $installed='false';
-$values=array(
-	'installed'=>$installed,
-	'version'=>implode('.', OC_Util::getVersion()),
-	'versionstring'=>OC_Util::getVersionString(),
-	'edition'=>OC_Util::getEditionString());
+	require_once 'lib/base.php';
 
-echo(json_encode($values));
+	if(OC_Config::getValue('installed')==1) $installed='true'; else $installed='false';
+	$values=array(
+		'installed'=>$installed,
+		'version'=>implode('.', OC_Util::getVersion()),
+		'versionstring'=>OC_Util::getVersionString(),
+		'edition'=>OC_Util::getEditionString());
+
+	echo(json_encode($values));
+
+} catch (Exception $ex) {
+	OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
+	\OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL);
+}
\ No newline at end of file
diff --git a/tests/data/db_structure.xml b/tests/data/db_structure.xml
index af2e5ce3439..8f6dc5e2ecd 100644
--- a/tests/data/db_structure.xml
+++ b/tests/data/db_structure.xml
@@ -9,7 +9,7 @@
 
  <table>
 
-  <name>*dbprefix*contacts_addressbooks</name>
+  <name>*dbprefix*cntcts_addrsbks</name>
 
   <declaration>
 
@@ -77,7 +77,7 @@
 
  <table>
 
-  <name>*dbprefix*contacts_cards</name>
+  <name>*dbprefix*cntcts_cards</name>
 
   <declaration>
 
diff --git a/tests/data/db_structure2.xml b/tests/data/db_structure2.xml
index c1bbb550483..fc6fe0bba7d 100644
--- a/tests/data/db_structure2.xml
+++ b/tests/data/db_structure2.xml
@@ -9,7 +9,7 @@
 
  <table>
 
-  <name>*dbprefix*contacts_addressbooks</name>
+  <name>*dbprefix*cntcts_addrsbks</name>
 
   <declaration>
 
diff --git a/tests/lib/db.php b/tests/lib/db.php
index 440f3fb6bfd..afbdb413c3d 100644
--- a/tests/lib/db.php
+++ b/tests/lib/db.php
@@ -22,8 +22,8 @@ class Test_DB extends PHPUnit_Framework_TestCase {
 		OC_DB::createDbFromStructure(self::$schema_file);
 
 		$this->test_prefix = $r;
-		$this->table1 = $this->test_prefix.'contacts_addressbooks';
-		$this->table2 = $this->test_prefix.'contacts_cards';
+		$this->table1 = $this->test_prefix.'cntcts_addrsbks';
+		$this->table2 = $this->test_prefix.'cntcts_cards';
 		$this->table3 = $this->test_prefix.'vcategory';
 	}
 
@@ -33,38 +33,41 @@ class Test_DB extends PHPUnit_Framework_TestCase {
 	}
 
 	public function testQuotes() {
-		$query = OC_DB::prepare('SELECT `fullname` FROM *PREFIX*'.$this->table2.' WHERE `uri` = ?');
+		$query = OC_DB::prepare('SELECT `fullname` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?');
 		$result = $query->execute(array('uri_1'));
 		$this->assertTrue((bool)$result);
 		$row = $result->fetchRow();
-		$this->assertFalse($row);
-		$query = OC_DB::prepare('INSERT INTO *PREFIX*'.$this->table2.' (`fullname`,`uri`) VALUES (?,?)');
+		$this->assertFalse((bool)$row); //PDO returns false, MDB2 returns null
+		$query = OC_DB::prepare('INSERT INTO `*PREFIX*'.$this->table2.'` (`fullname`,`uri`) VALUES (?,?)');
 		$result = $query->execute(array('fullname test', 'uri_1'));
 		$this->assertTrue((bool)$result);
-		$query = OC_DB::prepare('SELECT `fullname`,`uri` FROM *PREFIX*'.$this->table2.' WHERE `uri` = ?');
+		$query = OC_DB::prepare('SELECT `fullname`,`uri` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?');
 		$result = $query->execute(array('uri_1'));
 		$this->assertTrue((bool)$result);
 		$row = $result->fetchRow();
 		$this->assertArrayHasKey('fullname', $row);
 		$this->assertEquals($row['fullname'], 'fullname test');
 		$row = $result->fetchRow();
-		$this->assertFalse($row);
+		$this->assertFalse((bool)$row); //PDO returns false, MDB2 returns null
 	}
 
+	/**
+	 * @medium
+	 */
 	public function testNOW() {
-		$query = OC_DB::prepare('INSERT INTO *PREFIX*'.$this->table2.' (`fullname`,`uri`) VALUES (NOW(),?)');
+		$query = OC_DB::prepare('INSERT INTO `*PREFIX*'.$this->table2.'` (`fullname`,`uri`) VALUES (NOW(),?)');
 		$result = $query->execute(array('uri_2'));
 		$this->assertTrue((bool)$result);
-		$query = OC_DB::prepare('SELECT `fullname`,`uri` FROM *PREFIX*'.$this->table2.' WHERE `uri` = ?');
+		$query = OC_DB::prepare('SELECT `fullname`,`uri` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?');
 		$result = $query->execute(array('uri_2'));
 		$this->assertTrue((bool)$result);
 	}
 
 	public function testUNIX_TIMESTAMP() {
-		$query = OC_DB::prepare('INSERT INTO *PREFIX*'.$this->table2.' (`fullname`,`uri`) VALUES (UNIX_TIMESTAMP(),?)');
+		$query = OC_DB::prepare('INSERT INTO `*PREFIX*'.$this->table2.'` (`fullname`,`uri`) VALUES (UNIX_TIMESTAMP(),?)');
 		$result = $query->execute(array('uri_3'));
 		$this->assertTrue((bool)$result);
-		$query = OC_DB::prepare('SELECT `fullname`,`uri` FROM *PREFIX*'.$this->table2.' WHERE `uri` = ?');
+		$query = OC_DB::prepare('SELECT `fullname`,`uri` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?');
 		$result = $query->execute(array('uri_3'));
 		$this->assertTrue((bool)$result);
 	}
@@ -88,7 +91,7 @@ class Test_DB extends PHPUnit_Framework_TestCase {
 			$this->assertTrue((bool)$result);
 		}
 
-		$query = OC_DB::prepare('SELECT * FROM *PREFIX*'.$this->table3);
+		$query = OC_DB::prepare('SELECT * FROM `*PREFIX*'.$this->table3.'`');
 		$result = $query->execute();
 		$this->assertTrue((bool)$result);
 		$this->assertEquals('4', $result->numRows());
@@ -100,10 +103,10 @@ class Test_DB extends PHPUnit_Framework_TestCase {
 		$carddata = 'This is a vCard';
 
 		// Normal test to have same known data inserted.
-		$query = OC_DB::prepare('INSERT INTO *PREFIX*'.$this->table2.' (`fullname`, `uri`, `carddata`) VALUES (?, ?, ?)');
+		$query = OC_DB::prepare('INSERT INTO `*PREFIX*'.$this->table2.'` (`fullname`, `uri`, `carddata`) VALUES (?, ?, ?)');
 		$result = $query->execute(array($fullname, $uri, $carddata));
 		$this->assertTrue((bool)$result);
-		$query = OC_DB::prepare('SELECT `fullname`, `uri`, `carddata` FROM *PREFIX*'.$this->table2.' WHERE `uri` = ?');
+		$query = OC_DB::prepare('SELECT `fullname`, `uri`, `carddata` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?');
 		$result = $query->execute(array($uri));
 		$this->assertTrue((bool)$result);
 		$row = $result->fetchRow();
@@ -119,7 +122,7 @@ class Test_DB extends PHPUnit_Framework_TestCase {
 			));
 		$this->assertTrue((bool)$result);
 
-		$query = OC_DB::prepare('SELECT `fullname`, `uri`, `carddata` FROM *PREFIX*'.$this->table2.' WHERE `uri` = ?');
+		$query = OC_DB::prepare('SELECT `fullname`, `uri`, `carddata` FROM `*PREFIX*'.$this->table2.'` WHERE `uri` = ?');
 		$result = $query->execute(array($uri));
 		$this->assertTrue((bool)$result);
 		$row = $result->fetchRow();
diff --git a/tests/lib/dbschema.php b/tests/lib/dbschema.php
index e20a04ef7fd..59f203993ef 100644
--- a/tests/lib/dbschema.php
+++ b/tests/lib/dbschema.php
@@ -26,8 +26,8 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase {
 		file_put_contents( self::$schema_file2, $content );
 
 		$this->test_prefix = $r;
-		$this->table1 = $this->test_prefix.'contacts_addressbooks';
-		$this->table2 = $this->test_prefix.'contacts_cards';
+		$this->table1 = $this->test_prefix.'cntcts_addrsbks';
+		$this->table2 = $this->test_prefix.'cntcts_cards';
 	}
 
 	public function tearDown() {
@@ -36,6 +36,9 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase {
 	}
 
 	// everything in one test, they depend on each other
+	/**
+	 * @medium
+	 */
 	public function testSchema() {
 		$this->doTestSchemaCreating();
 		$this->doTestSchemaChanging();
@@ -91,13 +94,18 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase {
 				break;
 			case 'pgsql':
 				$sql = "SELECT tablename AS table_name, schemaname AS schema_name "
-					. "FROM pg_tables WHERE schemaname NOT LIKE 'pg_%' "
+					.  "FROM pg_tables WHERE schemaname NOT LIKE 'pg_%' "
 					.  "AND schemaname != 'information_schema' "
 					.  "AND tablename = '".$table."'";
 				$query = OC_DB::prepare($sql);
 				$result = $query->execute(array());
 				$exists = $result && $result->fetchOne();
 				break;
+			case 'oci':
+				$sql = 'SELECT table_name FROM user_tables WHERE table_name = ?';
+				$result = \OC_DB::executeAudited($sql, array($table));
+				$exists = (bool)$result->fetchOne(); //oracle uses MDB2 and returns null
+				break;
 			case 'mssql':
 				$sql = "SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = '{$table}'";
 				$query = OC_DB::prepare($sql);
diff --git a/tests/lib/files/cache/watcher.php b/tests/lib/files/cache/watcher.php
index e43c86ed438..749b1ab75a3 100644
--- a/tests/lib/files/cache/watcher.php
+++ b/tests/lib/files/cache/watcher.php
@@ -29,6 +29,9 @@ class Watcher extends \PHPUnit_Framework_TestCase {
 		}
 	}
 
+	/**
+	 * @medium
+	 */
 	function testWatcher() {
 		$storage = $this->getTestStorage();
 		$cache = $storage->getCache();
@@ -63,6 +66,9 @@ class Watcher extends \PHPUnit_Framework_TestCase {
 		$this->assertFalse($cache->inCache('folder/bar2.txt'));
 	}
 
+	/**
+	 * @medium
+	 */
 	public function testFileToFolder() {
 		$storage = $this->getTestStorage();
 		$cache = $storage->getCache();
diff --git a/tests/lib/files/mapper.php b/tests/lib/files/mapper.php
index e3859bc0f23..48ae95b7e72 100644
--- a/tests/lib/files/mapper.php
+++ b/tests/lib/files/mapper.php
@@ -45,8 +45,20 @@ class Mapper extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals('D:/a/b/text', $this->mapper->slugifyPath('D:/a/b/text'));
 
 		// with double dot
-		$this->assertEquals('D:/text-text.txt', $this->mapper->slugifyPath('D:/text.text.txt'));
-		$this->assertEquals('D:/text-text-2.txt', $this->mapper->slugifyPath('D:/text.text.txt', 2));
-		$this->assertEquals('D:/a/b/text-text.txt', $this->mapper->slugifyPath('D:/a/b/text.text.txt'));
+		$this->assertEquals('D:/text.text.txt', $this->mapper->slugifyPath('D:/text.text.txt'));
+		$this->assertEquals('D:/text.text-2.txt', $this->mapper->slugifyPath('D:/text.text.txt', 2));
+		$this->assertEquals('D:/a/b/text.text.txt', $this->mapper->slugifyPath('D:/a/b/text.text.txt'));
+			
+		// foldername and filename with periods
+		$this->assertEquals('D:/folder.name.with.periods', $this->mapper->slugifyPath('D:/folder.name.with.periods'));
+		$this->assertEquals('D:/folder.name.with.periods/test-2.txt', $this->mapper->slugifyPath('D:/folder.name.with.periods/test.txt', 2));
+		$this->assertEquals('D:/folder.name.with.periods/test.txt', $this->mapper->slugifyPath('D:/folder.name.with.periods/test.txt'));
+
+		// foldername and filename with periods and spaces
+		$this->assertEquals('D:/folder.name.with.peri-ods', $this->mapper->slugifyPath('D:/folder.name.with.peri ods'));
+		$this->assertEquals('D:/folder.name.with.peri-ods/te-st-2.t-x-t', $this->mapper->slugifyPath('D:/folder.name.with.peri ods/te st.t x t', 2));
+		$this->assertEquals('D:/folder.name.with.peri-ods/te-st.t-x-t', $this->mapper->slugifyPath('D:/folder.name.with.peri ods/te st.t x t'));
+
+		
 	}
 }
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index 01f9a9cca11..830913a91ad 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -33,6 +33,9 @@ class View extends \PHPUnit_Framework_TestCase {
 		}
 	}
 
+	/**
+	 * @medium
+	 */
 	public function testCacheAPI() {
 		$storage1 = $this->getTestStorage();
 		$storage2 = $this->getTestStorage();
@@ -104,6 +107,9 @@ class View extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals(array(), $rootView->getDirectoryContent('/non/existing'));
 	}
 
+	/**
+	 * @medium
+	 */
 	function testGetPath() {
 		$storage1 = $this->getTestStorage();
 		$storage2 = $this->getTestStorage();
@@ -127,6 +133,9 @@ class View extends \PHPUnit_Framework_TestCase {
 		$this->assertNull($folderView->getPath($id1));
 	}
 
+	/**
+	 * @medium
+	 */
 	function testMountPointOverwrite() {
 		$storage1 = $this->getTestStorage(false);
 		$storage2 = $this->getTestStorage();
@@ -170,6 +179,9 @@ class View extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals($textSize, $folderData[0]['size']);
 	}
 
+	/**
+	 * @medium
+	 */
 	function testSearch() {
 		$storage1 = $this->getTestStorage();
 		$storage2 = $this->getTestStorage();
@@ -217,6 +229,9 @@ class View extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals(3, count($folderView->searchByMime('text')));
 	}
 
+	/**
+	 * @medium
+	 */
 	function testWatcher() {
 		$storage1 = $this->getTestStorage();
 		\OC\Files\Filesystem::mount($storage1, array(), '/');
@@ -234,6 +249,9 @@ class View extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals(3, $cachedData['size']);
 	}
 
+	/**
+	 * @medium
+	 */
 	function testCopyBetweenStorages() {
 		$storage1 = $this->getTestStorage();
 		$storage2 = $this->getTestStorage();
@@ -255,6 +273,9 @@ class View extends \PHPUnit_Framework_TestCase {
 		$this->assertTrue($rootView->file_exists('/substorage/folder/bar.txt'));
 	}
 
+	/**
+	 * @medium
+	 */
 	function testMoveBetweenStorages() {
 		$storage1 = $this->getTestStorage();
 		$storage2 = $this->getTestStorage();
@@ -271,6 +292,9 @@ class View extends \PHPUnit_Framework_TestCase {
 		$this->assertTrue($rootView->file_exists('anotherfolder/bar.txt'));
 	}
 
+	/**
+	 * @medium
+	 */
 	function testTouch() {
 		$storage = $this->getTestStorage(true, '\Test\Files\TemporaryNoTouch');
 
diff --git a/tests/lib/geo.php b/tests/lib/geo.php
index 82e61608687..2c3611c092e 100644
--- a/tests/lib/geo.php
+++ b/tests/lib/geo.php
@@ -7,6 +7,10 @@
  */
 
 class Test_Geo extends PHPUnit_Framework_TestCase {
+	
+	/**
+	 * @medium
+	 */
 	function testTimezone() {
 		$result = OC_Geo::timezone(3, 3);
 		$expected = 'Africa/Porto-Novo';
diff --git a/tests/lib/helper.php b/tests/lib/helper.php
index 336e8f8b3c5..6acb0dfaa6b 100644
--- a/tests/lib/helper.php
+++ b/tests/lib/helper.php
@@ -67,6 +67,15 @@ class Test_Helper extends PHPUnit_Framework_TestCase {
 		$this->assertEquals($result, $expected);
 	}
 
+	function testGetFileNameMimeType() {
+		$this->assertEquals('text/plain', OC_Helper::getFileNameMimeType('foo.txt'));
+		$this->assertEquals('image/png', OC_Helper::getFileNameMimeType('foo.png'));
+		$this->assertEquals('image/png', OC_Helper::getFileNameMimeType('foo.bar.png'));
+		$this->assertEquals('application/octet-stream', OC_Helper::getFileNameMimeType('.png'));
+		$this->assertEquals('application/octet-stream', OC_Helper::getFileNameMimeType('foo'));
+		$this->assertEquals('application/octet-stream', OC_Helper::getFileNameMimeType(''));
+	}
+
 	function testGetStringMimeType() {
 		$result = OC_Helper::getStringMimeType("/data/data.tar.gz");
 		$expected = 'text/plain; charset=us-ascii';
diff --git a/tests/phpunit-autotest.xml b/tests/phpunit-autotest.xml
index e9ee7d8d70d..23b2d6c0060 100644
--- a/tests/phpunit-autotest.xml
+++ b/tests/phpunit-autotest.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<phpunit bootstrap="bootstrap.php">
+<phpunit bootstrap="bootstrap.php"
+		 strict="true"
+		 timeoutForSmallTests="900"
+		 timeoutForMediumTests="900"
+		 timeoutForLargeTests="900"
+>
 	<testsuite name='ownCloud'>
 		<directory suffix='.php'>lib/</directory>
 		<file>apps.php</file>
@@ -22,6 +27,10 @@
 				<directory suffix=".php">../apps/user_ldap/l10n</directory>
 				<directory suffix=".php">../apps/user_webdavauth/l10n</directory>
 				<directory suffix=".php">../lib/MDB2</directory>
+				<directory suffix=".php">../lib/l10n</directory>
+				<directory suffix=".php">../core/l10n</directory>
+				<directory suffix=".php">../settings/l10n</directory>
+				<directory suffix=".php">../tests</directory>
 			</exclude>
 		</whitelist>
 	</filter>