diff --git a/.gitignore b/.gitignore
index fe89c74ab38864939d737fa40f8ff0671e5c6372..68977ad07753ddd9870ad5a0c05e0ce3d8ef1d68 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/CONTRIBUTING.md b/CONTRIBUTING.md
index fd87513ec2a86c870ace782ab9ec8282a1017307..a79fcc08d608d01a4e53e502076f5ebfe8b6eaeb 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/ajax/scan.php b/apps/files/ajax/scan.php
index 391b98608bdbbffa9a67c9ba3c6e0b79f88435eb..0706d4e78296b0afdd677e8072cd61266bdcdfce 100644
--- a/apps/files/ajax/scan.php
+++ b/apps/files/ajax/scan.php
@@ -4,6 +4,16 @@ session_write_close();
 
 $force = (isset($_GET['force']) and ($_GET['force'] === 'true'));
 $dir = isset($_GET['dir']) ? $_GET['dir'] : '';
+if (isset($_GET['users'])) {
+	OC_JSON::checkAdminUser();
+	if ($_GET['users'] === 'all') {
+		$users = OC_User::getUsers();
+	} else {
+		$users = json_decode($_GET['users']);
+	}
+} else {
+	$users = array(OC_User::getUser());
+}
 
 $eventSource = new OC_EventSource();
 ScanListener::$eventSource = $eventSource;
@@ -12,21 +22,27 @@ ScanListener::$view = \OC\Files\Filesystem::getView();
 OC_Hook::connect('\OC\Files\Cache\Scanner', 'scan_folder', 'ScanListener', 'folder');
 OC_Hook::connect('\OC\Files\Cache\Scanner', 'scan_file', 'ScanListener', 'file');
 
-$absolutePath = \OC\Files\Filesystem::getView()->getAbsolutePath($dir);
+foreach ($users as $user) {
+	$eventSource->send('user', $user);
+	OC_Util::tearDownFS();
+	OC_Util::setupFS($user);
+
+	$absolutePath = \OC\Files\Filesystem::getView()->getAbsolutePath($dir);
 
-$mountPoints = \OC\Files\Filesystem::getMountPoints($absolutePath);
-$mountPoints[] = \OC\Files\Filesystem::getMountPoint($absolutePath);
-$mountPoints = array_reverse($mountPoints); //start with the mount point of $dir
+	$mountPoints = \OC\Files\Filesystem::getMountPoints($absolutePath);
+	$mountPoints[] = \OC\Files\Filesystem::getMountPoint($absolutePath);
+	$mountPoints = array_reverse($mountPoints); //start with the mount point of $dir
 
-foreach ($mountPoints as $mountPoint) {
-	$storage = \OC\Files\Filesystem::getStorage($mountPoint);
-	if ($storage) {
-		ScanListener::$mountPoints[$storage->getId()] = $mountPoint;
-		$scanner = $storage->getScanner();
-		if ($force) {
-			$scanner->scan('');
-		} else {
-			$scanner->backgroundScan();
+	foreach ($mountPoints as $mountPoint) {
+		$storage = \OC\Files\Filesystem::getStorage($mountPoint);
+		if ($storage) {
+			ScanListener::$mountPoints[$storage->getId()] = $mountPoint;
+			$scanner = $storage->getScanner();
+			if ($force) {
+				$scanner->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE, \OC\Files\Cache\Scanner::REUSE_ETAG);
+			} else {
+				$scanner->backgroundScan();
+			}
 		}
 	}
 }
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index f788949b1b62feb82a07a8d6eb3f733f2a0f846e..108dcd741c674aae49089da194936795a66067cd 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 c24d1fd8244dd124d781e41f140cae700b6bb528..e19a35bbc5b6f3542506785e811cd917b70ad567 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/js/files.js b/apps/files/js/files.js
index a79d34c9b23545ce3b9d042b0ebd529bd99a19a3..3438c1c30a131665a15fbb275bff1fc18841c161 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -695,7 +695,7 @@ $(document).ready(function() {
 	}
 });
 
-function scanFiles(force, dir){
+function scanFiles(force, dir, users){
 	if (!OC.currentUser) {
 		return;
 	}
@@ -705,7 +705,18 @@ function scanFiles(force, dir){
 	}
 	force = !!force; //cast to bool
 	scanFiles.scanning = true;
-	var scannerEventSource = new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force:force,dir:dir});
+	var scannerEventSource;
+	if (users) {
+		var usersString;
+		if (users === 'all') {
+			usersString = users;
+		} else {
+			usersString = JSON.stringify(users);
+		}
+		scannerEventSource = new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force: force,dir: dir, users: usersString});
+	} else {
+		scannerEventSource = new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force: force,dir: dir});
+	}
 	scanFiles.cancel = scannerEventSource.close.bind(scannerEventSource);
 	scannerEventSource.listen('count',function(count){
 		console.log(count + ' files scanned')
@@ -717,6 +728,9 @@ function scanFiles(force, dir){
 		scanFiles.scanning=false;
 		console.log('done after ' + count + ' files');
 	});
+	scannerEventSource.listen('user',function(user){
+		console.log('scanning files for ' + user);
+	});
 }
 scanFiles.scanning=false;
 
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index de6a15424212d891a01bf270a991c85ceedb9461..8c6b6372655a99d639d43d965e5bdf4ef3c68602 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} složky",
 "1 file" => "1 soubor",
 "{count} files" => "{count} soubory",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Název složky nelze použít. Použití názvu 'Shared' je ownCloudem rezervováno",
 "Unable to rename file" => "Nelze přejmenovat soubor",
 "Upload" => "Odeslat",
 "File handling" => "Zacházení se soubory",
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index 879fbc8451fcbb0ba17e2acae0609c4adb22f00d..542e0d05d6004efb140997ac6f5058aaa8998c8b 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/de.php b/apps/files/l10n/de.php
index bcc3a4c6c9da269ffdc8e8bf943bf4eaaa0f3b7a..e9a6ad6bdef97996d8f5c846eb4a6052528148ac 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} Ordner",
 "1 file" => "1 Datei",
 "{count} files" => "{count} Dateien",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Der Ordnername ist ungültig. Nur ownCloud kann den Ordner \"Shared\" anlegen",
 "Unable to rename file" => "Konnte Datei nicht umbenennen",
 "Upload" => "Hochladen",
 "File handling" => "Dateibehandlung",
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index 3eeb88754c75fdde2d0082fa205e8d2038210059..d4cc7b2bb945d3efadeb561dabc26c9ca90b719b 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -9,9 +9,11 @@
 "No file was uploaded" => "Neniu dosiero alŝutiĝis.",
 "Missing a temporary folder" => "Mankas provizora dosierujo.",
 "Failed to write to disk" => "Malsukcesis skribo al disko",
+"Not enough storage available" => "Ne haveblas sufiĉa memoro",
 "Invalid directory." => "Nevalida dosierujo.",
 "Files" => "Dosieroj",
 "Share" => "Kunhavigi",
+"Delete permanently" => "Forigi por ĉiam",
 "Delete" => "Forigi",
 "Rename" => "Alinomigi",
 "Pending" => "Traktotaj",
@@ -21,11 +23,14 @@
 "cancel" => "nuligi",
 "replaced {new_name} with {old_name}" => "anstataŭiĝis {new_name} per {old_name}",
 "undo" => "malfari",
+"perform delete operation" => "plenumi forigan operacion",
 "1 file uploading" => "1 dosiero estas alŝutata",
 "files uploading" => "dosieroj estas alŝutataj",
 "'.' is an invalid file name." => "'.' ne estas valida dosiernomo.",
 "File name cannot be empty." => "Dosiernomo devas ne malpleni.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, “|”, “?” kaj “*” ne permesatas.",
+"Your storage is full, files can not be updated or synced anymore!" => "Via memoro plenas, ne plu eblas ĝisdatigi aŭ sinkronigi dosierojn!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Via memoro preskaÅ­ plenas ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Via elŝuto pretiĝatas. Ĉi tio povas daŭri iom da tempo se la dosieroj grandas.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn",
 "Not enough space available" => "Ne haveblas sufiĉa spaco",
@@ -41,6 +46,7 @@
 "{count} folders" => "{count} dosierujoj",
 "1 file" => "1 dosiero",
 "{count} files" => "{count} dosierujoj",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nevalida dosierujnomo. La uzo de “Shared” estas rezervita de ownCloud.",
 "Unable to rename file" => "Ne eblis alinomigi dosieron",
 "Upload" => "Alŝuti",
 "File handling" => "Dosieradministro",
@@ -55,12 +61,15 @@
 "Text file" => "Tekstodosiero",
 "Folder" => "Dosierujo",
 "From link" => "El ligilo",
+"Deleted files" => "Forigitaj dosieroj",
 "Cancel upload" => "Nuligi alŝuton",
+"You don’t have write permissions here." => "Vi ne havas permeson skribi ĉi tie.",
 "Nothing in here. Upload something!" => "Nenio estas ĉi tie. Alŝutu ion!",
 "Download" => "Elŝuti",
 "Unshare" => "Malkunhavigi",
 "Upload too large" => "Alŝuto tro larĝa",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo.",
 "Files are being scanned, please wait." => "Dosieroj estas skanataj, bonvolu atendi.",
-"Current scanning" => "Nuna skano"
+"Current scanning" => "Nuna skano",
+"Upgrading filesystem cache..." => "Ĝisdatiĝas dosiersistema kaŝmemoro..."
 );
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index 963f25ebedcd661eb55f46ecd4c458b116fd0a91..b15c7a564997ce73cf8f34f125a70ae828beb6cf 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "לא ניתן להעביר את %s - קובץ בשם הזה כבר קיים",
+"Could not move %s" => "לא ניתן להעביר את %s",
 "No file was uploaded. Unknown error" => "לא הועלה קובץ. טעות בלתי מזוהה.",
 "There is no error, the file uploaded with success" => "לא התרחשה שגיאה, הקובץ הועלה בהצלחה",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "הקבצים שנשלחו חורגים מהגודל שצוין בהגדרה upload_max_filesize שבקובץ php.ini:",
@@ -7,6 +9,8 @@
 "No file was uploaded" => "שום קובץ לא הועלה",
 "Missing a temporary folder" => "תקיה זמנית חסרה",
 "Failed to write to disk" => "הכתיבה לכונן נכשלה",
+"Not enough storage available" => "אין די שטח פנוי באחסון",
+"Invalid directory." => "תיקייה שגויה.",
 "Files" => "קבצים",
 "Share" => "שתף",
 "Delete permanently" => "מחק לצמיתות",
@@ -19,7 +23,9 @@
 "cancel" => "ביטול",
 "replaced {new_name} with {old_name}" => "{new_name} הוחלף ב־{old_name}",
 "undo" => "ביטול",
+"perform delete operation" => "ביצוע פעולת מחיקה",
 "1 file uploading" => "קובץ אחד נשלח",
+"files uploading" => "קבצים בהעלאה",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים",
 "Upload cancelled." => "ההעלאה בוטלה.",
@@ -33,6 +39,7 @@
 "{count} folders" => "{count} תיקיות",
 "1 file" => "קובץ אחד",
 "{count} files" => "{count} קבצים",
+"Unable to rename file" => "לא ניתן לשנות את שם הקובץ",
 "Upload" => "העלאה",
 "File handling" => "טיפול בקבצים",
 "Maximum upload size" => "גודל העלאה מקסימלי",
diff --git a/apps/files/l10n/hi.php b/apps/files/l10n/hi.php
new file mode 100644
index 0000000000000000000000000000000000000000..df57abe28b64d5ae5ac05b2a8b2d7e06f6df04a7
--- /dev/null
+++ b/apps/files/l10n/hi.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Share" => "साझा करें",
+"Save" => "सहेजें"
+);
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index 3e2ea80c9491d42023a6bfd8f6dd17671ffa7a3d..5938521beaba2fb160ce57c76be6c5ca28f9ebc3 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -1,12 +1,19 @@
 <?php $TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "Nepavyko perkelti %s - failas su tokiu pavadinimu jau egzistuoja",
+"Could not move %s" => "Nepavyko perkelti %s",
+"No file was uploaded. Unknown error" => "Failai nebuvo įkelti dėl nežinomos priežasties",
 "There is no error, the file uploaded with success" => "Failas įkeltas sėkmingai, be klaidų",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Įkeliamas failas yra didesnis nei leidžia upload_max_filesize php.ini faile:",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Įkeliamo failo dydis viršija MAX_FILE_SIZE nustatymą, kuris naudojamas HTML formoje.",
 "The uploaded file was only partially uploaded" => "Failas buvo įkeltas tik dalinai",
 "No file was uploaded" => "Nebuvo įkeltas joks failas",
 "Missing a temporary folder" => "NÄ—ra laikinojo katalogo",
 "Failed to write to disk" => "Nepavyko įrašyti į diską",
+"Not enough storage available" => "Nepakanka vietos serveryje",
+"Invalid directory." => "Neteisingas aplankas",
 "Files" => "Failai",
 "Share" => "Dalintis",
+"Delete permanently" => "Ištrinti negrįžtamai",
 "Delete" => "IÅ¡trinti",
 "Rename" => "Pervadinti",
 "Pending" => "Laukiantis",
@@ -16,10 +23,21 @@
 "cancel" => "atšaukti",
 "replaced {new_name} with {old_name}" => "pakeiskite {new_name} į {old_name}",
 "undo" => "anuliuoti",
+"perform delete operation" => "ištrinti",
 "1 file uploading" => "įkeliamas 1 failas",
+"files uploading" => "įkeliami failai",
+"'.' is an invalid file name." => "'.' yra neleidžiamas failo pavadinime.",
+"File name cannot be empty." => "Failo pavadinimas negali būti tuščias.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neleistinas pavadinimas, '\\', '/', '<', '>', ':', '\"', '|', '?' ir '*' yra neleidžiami.",
+"Your storage is full, files can not be updated or synced anymore!" => "Jūsų visa vieta serveryje užimta",
+"Your storage is almost full ({usedSpacePercent}%)" => "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "Jūsų atsisiuntimas yra paruošiamas. tai gali užtrukti jei atsisiunčiamas didelis failas.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai katalogas",
+"Not enough space available" => "Nepakanka vietos",
 "Upload cancelled." => "Įkėlimas atšauktas.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks.",
+"URL cannot be empty." => "URL negali būti tuščias.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud",
 "Error" => "Klaida",
 "Name" => "Pavadinimas",
 "Size" => "Dydis",
@@ -28,6 +46,8 @@
 "{count} folders" => "{count} aplankalai",
 "1 file" => "1 failas",
 "{count} files" => "{count} failai",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud",
+"Unable to rename file" => "Nepavyko pervadinti failo",
 "Upload" => "Įkelti",
 "File handling" => "Failų tvarkymas",
 "Maximum upload size" => "Maksimalus įkeliamo failo dydis",
@@ -40,12 +60,16 @@
 "New" => "Naujas",
 "Text file" => "Teksto failas",
 "Folder" => "Katalogas",
+"From link" => "IÅ¡ nuorodos",
+"Deleted files" => "IÅ¡trinti failai",
 "Cancel upload" => "Atšaukti siuntimą",
+"You don’t have write permissions here." => "Jūs neturite rašymo leidimo.",
 "Nothing in here. Upload something!" => "Čia tuščia. Įkelkite ką nors!",
 "Download" => "Atsisiųsti",
 "Unshare" => "Nebesidalinti",
 "Upload too large" => "Įkėlimui failas per didelis",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje",
 "Files are being scanned, please wait." => "Skenuojami failai, prašome palaukti.",
-"Current scanning" => "Å iuo metu skenuojama"
+"Current scanning" => "Å iuo metu skenuojama",
+"Upgrading filesystem cache..." => "Atnaujinamas sistemos kešavimas..."
 );
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index 8fdf62aeb32b1aab7004642d0287eb0c0142c930..59c12c57a38aa2de5e194e56560bebbd3b6720f3 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} foldare",
 "1 file" => "1 fisier",
 "{count} files" => "{count} fisiere",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nume de dosar invalid. Utilizarea 'Shared' e rezervată de ownCloud",
 "Unable to rename file" => "Nu s-a putut redenumi fișierul",
 "Upload" => "Încărcare",
 "File handling" => "Manipulare fișiere",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 83412bf2be80060232d6f0eece793056fc640832..43a8dc70080df7e29ff936e00aba65e8fecde4b6 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} папок",
 "1 file" => "1 файл",
 "{count} files" => "{count} файлов",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Неправильное имя каталога. Имя 'Shared' зарезервировано.",
 "Unable to rename file" => "Невозможно переименовать файл",
 "Upload" => "Загрузка",
 "File handling" => "Управление файлами",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index 82d169d569c0acbe23b24c29d47a81caedafe535..f433176159245c08135fc6fe48dbc5379386bb2c 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",
@@ -46,6 +46,7 @@
 "{count} folders" => "{count} mappar",
 "1 file" => "1 fil",
 "{count} files" => "{count} filer",
+"Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ogiltigt mappnamn. Användning av 'Shared' är reserverad av ownCloud",
 "Unable to rename file" => "Kan inte byta namn på filen",
 "Upload" => "Ladda upp",
 "File handling" => "Filhantering",
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index 1719d25e660103893c20d07fb3cf85e8fb4053e8..1e94275dcba006540f52af21a2b40b2d5fdc92c4 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/triggerupdate.php b/apps/files/triggerupdate.php
new file mode 100644
index 0000000000000000000000000000000000000000..0e29edbba35ef32f821d9782ba5ebe95e4e21cbd
--- /dev/null
+++ b/apps/files/triggerupdate.php
@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/../../lib/base.php';
+
+if (OC::$CLI) {
+	if (count($argv) === 2) {
+		$file = $argv[1];
+		list(, $user) = explode('/', $file);
+		OC_Util::setupFS($user);
+		$view = new \OC\Files\View('');
+		/**
+		 * @var \OC\Files\Storage\Storage $storage
+		 */
+		list($storage, $internalPath) = $view->resolvePath($file);
+		$watcher = $storage->getWatcher($internalPath);
+		$watcher->checkUpdate($internalPath);
+	} else {
+		echo "Usage: php triggerupdate.php /path/to/file\n";
+	}
+} else {
+	echo "This script can be run from the command line only\n";
+}
diff --git a/apps/files_encryption/ajax/changeRecoveryPassword.php b/apps/files_encryption/ajax/changeRecoveryPassword.php
index b0594f967ba30c88ff067ef122ba8f4b445eca50..366f634a51cc0504887abd1c599e320b404b4a5d 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 0000000000000000000000000000000000000000..6fd63dae9cdc2f7c5573a031ceedc4c9e091cebb
--- /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 99bdc2c24702fdea6f15ff29a78d2a225bcf0f67..d97811bb791e503052c8a85594d12555772b8920 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -10,45 +10,56 @@ 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('/');
 
-	$view = new OC_FilesystemView('/');
-	$session = new \OCA\Encryption\Session($view);
+		$sessionReady = false;
+		if(extension_loaded("openssl")) {
+			$session = new \OCA\Encryption\Session($view);
+			$sessionReady = true;
+		}
 
-	// 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 ($sessionReady === false
+			|| (!$view->file_exists('/' . $user . '/files_encryption/' . $user . '.private.key')
+				&& OCA\Encryption\Crypt::mode() === 'server')
+		) {
 
-		// Force the user to log-in again if the encryption key isn't unlocked
-		// (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/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index ea8f6cf6f310373685427f40ed18481c49c9d3c8..1e97b1b2217fd8042a5d93b5e8c2345d1bb957d6 100644
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@@ -2,7 +2,7 @@
 <info>
 	<id>files_encryption</id>
 	<name>Encryption</name>
-	<description>WARNING: This is a preview release of the new ownCloud 5 encryption system. Testing and feedback is very welcome but don't use this in production yet. Encryption is not yet compatible with LDAP.</description>
+	<description>WARNING: This is a preview release of the new ownCloud 5 encryption system. Testing and feedback is very welcome but don't use this in production yet. After the app was enabled you need to re-login to initialize your encryption keys</description>
 	<licence>AGPL</licence>
 	<author>Sam Tuke, Bjoern Schiessle, Florin Peter</author>
 	<require>4</require>
diff --git a/apps/files_encryption/files/error.php b/apps/files_encryption/files/error.php
new file mode 100644
index 0000000000000000000000000000000000000000..63c74e4e797de99a5569b735b27ec3becec65f98
--- /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 d1b08a0b9788d9261b1a01decd384f5b917d6d86..e39e068cc5d341897c5621a142262c8e8974e767 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -38,11 +38,15 @@ class Hooks {
 	 * @note This method should never be called for users using client side encryption
 	 */
 	public static function login($params) {
-
-		// Manually initialise Filesystem{} singleton with correct 
-		// fake root path, in order to avoid fatal webdav errors
-		// NOTE: disabled because this give errors on webdav!
-		//\OC\Files\Filesystem::init( $params['uid'], '/' . 'files' . '/' );
+		$l = new \OC_L10N('files_encryption');
+		//check if openssl is available
+		if(!extension_loaded("openssl") ) {
+			$error_msg = $l->t("PHP module OpenSSL is not installed.");
+			$hint = $l->t('Please ask your server administrator to install the module. For now the encryption app was disabled.');
+			\OC_App::disable('files_encryption');
+			\OCP\Util::writeLog('Encryption library', $error_msg . ' ' . $hint, \OCP\Util::ERROR);
+			\OCP\Template::printErrorPage($error_msg, $hint);
+		}
 
 		$view = new \OC_FilesystemView('/');
 
@@ -60,17 +64,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 +93,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 +114,7 @@ class Hooks {
 			}
 
 			// Register successful migration in DB
-			$util->setMigrationStatus(1);
+			$util->finishMigration();
 
 		}
 
@@ -141,6 +153,15 @@ class Hooks {
 		\OC_FileProxy::$enabled = $proxyStatus;
 	}
 
+	/**
+	 * @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
@@ -148,7 +169,7 @@ class Hooks {
 	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 +354,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 +431,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 312b672ad464be90d5b3ef5cd466c5677141baa2..d6535a25b704b85efb0f6eed02536dd3396c3f9c 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 46e91d1f0709f5e7ae5a0577f4402c6daf9b971c..44836fb9c964db656931d2abb9f127c29d0a7761 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -1,4 +1,29 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "La clau de recuperació s'ha activat",
+"Could not enable recovery key. Please check your recovery key password!" => "No s'ha pogut activar la clau de recuperació. Comproveu contrasenya de la clau de recuperació!",
+"Recovery key successfully disabled" => "La clau de recuperació s'ha descativat",
+"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...",
-"Encryption" => "Xifrat"
+"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",
+"Enabled" => "Activat",
+"Disabled" => "Desactivat",
+"Change Password" => "Canvia la contrasenya",
+"Your private key password no longer match your log-in password:" => "La clau privada ja no es correspon amb la contrasenya d'accés:",
+"Set your old private key password to your current log-in password." => "Establiu la vostra contrasenya clau en funció de la contrasenya actual d'accés.",
+" 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 f9b2dd06b6f2b989bded468b7c5b4d99dcae27c4..88548b94306da1d7aff647e838708d2948539b05 100644
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -1,4 +1,20 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Záchranný klíč byl úspěšně povolen",
+"Could not enable recovery key. Please check your recovery key password!" => "Nepodařilo se povolit záchranný klíč. Zkontrolujte prosím vaše heslo záchranného klíče!",
+"Recovery key successfully disabled" => "Záchranný klíč byl úspěšně zakázán",
+"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í"
+"Encryption" => "Šifrování",
+"Enabled" => "Povoleno",
+"Disabled" => "Zakázáno",
+"Change Password" => "Změnit heslo",
+"Enable password recovery:" => "Povolit obnovu hesla:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Povolení vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo",
+"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 2ab77f480cfd4fa3687748e3ae07b7c3973766a3..ed9b8d6c16e3f7e1bbed1c56bd21f6f32094b5ee 100644
--- a/apps/files_encryption/l10n/de.php
+++ b/apps/files_encryption/l10n/de.php
@@ -1,4 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Wiederherstellungsschlüssel wurde erfolgreich aktiviert",
+"Could not enable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Überprüfen Sie Ihr Wiederherstellungspasswort!",
+"Recovery key successfully disabled" => "Wiederherstellungsschlüssel deaktiviert.",
+"Could not disable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Überprüfen Sie Ihr Wiederherstellungspasswort!",
+"Password successfully changed." => "Dein Passwort wurde geändert.",
+"Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
+"Private key password successfully updated." => "Passwort des privaten Schlüssels erfolgreich aktualisiert",
 "Saving..." => "Speichern...",
-"Encryption" => "Verschlüsselung"
+"personal settings" => "Private Einstellungen",
+"Encryption" => "Verschlüsselung",
+"Enabled" => "Aktiviert",
+"Disabled" => "Deaktiviert",
+"Change Password" => "Passwort ändern",
+"Old log-in password" => "Altes login Passwort",
+"Current log-in password" => "Aktuelles Passwort",
+"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 884ed3c50b03d0439e5b752049b32eff721c5bed..59ccbaa1fc11faca5c2ea7cc87039bbba1c62b36 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -5,15 +5,22 @@
 "Could not disable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
 "Password successfully changed." => "Das Passwort wurde erfolgreich geändert.",
 "Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
+"Private key password successfully updated." => "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
+"Could not update the private key password. Maybe the old password was not correct." => "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.",
+"PHP module OpenSSL is not installed." => "Das PHP-Modul OpenSSL ist nicht installiert.",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Bitte fragen Sie Ihren Server-Administrator, das entsprechende Modul zu installieren. Bis dahin wurde die Anwendung zur Verschlüsselung deaktiviert.",
 "Saving..." => "Speichern...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Ihr privater Schlüssel ist ungültig! Vielleicht wurde Ihr Passwort von außerhalb geändert.",
+"personal settings" => "Persönliche Einstellungen",
 "Encryption" => "Verschlüsselung",
-"Recovery account password" => "Account-Passwort wiederherstellen",
 "Enabled" => "Aktiviert",
 "Disabled" => "Deaktiviert",
-"Old Recovery account password" => "Altes Passwort für die Account-Wiederherstellung",
-"New Recovery account password" => "Neues Passwort für die Account-Wiederherstellung",
 "Change Password" => "Passwort ändern",
-"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.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
+"Old log-in password" => "Altes Login-Passwort",
+"Current log-in password" => "Momentanes Login-Passwort",
+"Update Private Key Password" => "Das Passwort des privaten Schlüssels aktualisieren",
+"Enable password recovery:" => "Passwort-Wiederherstellung aktivieren:",
 "File recovery settings updated" => "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
 "Could not update file recovery" => "Die Dateiwiederherstellung konnte nicht aktualisiert werden."
 );
diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php
index 7067799cd2e1afea357adf31f6ba1d9c559e4343..990f464bc1a17b4b116e6a72c12a18d13ca7e2bf 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" => "Κρυπτογράφηση"
+"personal settings" => "προσωπικές ρυθμίσεις",
+"Encryption" => "Κρυπτογράφηση",
+"Enabled" => "Ενεργοποιημένο",
+"Disabled" => "Απενεργοποιημένο",
+"Change Password" => "Αλλαγή Κωδικού Πρόσβασης",
+"File recovery settings updated" => "Οι ρυθμίσεις επαναφοράς αρχείων ανανεώθηκαν"
 );
diff --git a/apps/files_encryption/l10n/eo.php b/apps/files_encryption/l10n/eo.php
index ea405fda1ab7e1e219f53183c3d34977714f7b62..f6e0e884f35ee216f49b7add61e87c551c7fe5a0 100644
--- a/apps/files_encryption/l10n/eo.php
+++ b/apps/files_encryption/l10n/eo.php
@@ -1,4 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Password successfully changed." => "La pasvorto sukcese ŝanĝiĝis.",
+"Could not change the password. Maybe the old password was not correct." => "Ne eblis ŝanĝi la pasvorton. Eble la malnova pasvorto malĝustis.",
+"Private key password successfully updated." => "La pasvorto de la malpublika klavo sukcese ĝisdatiĝis.",
+"PHP module OpenSSL is not installed." => "La PHP-modulo OpenSSL ne instalitas.",
 "Saving..." => "Konservante...",
-"Encryption" => "Ĉifrado"
+"personal settings" => "persona agordo",
+"Encryption" => "Ĉifrado",
+"Enabled" => "Kapabligita",
+"Disabled" => "Malkapabligita",
+"Change Password" => "Ŝarĝi pasvorton",
+"Your private key password no longer match your log-in password:" => "La pasvorto de via malpublika klavo ne plu kongruas kun via ensaluta pasvorto:",
+"Old log-in password" => "Malnova ensaluta pasvorto",
+"Current log-in password" => "Nuna ensaluta pasvorto",
+"Update Private Key Password" => "Äœisdatigi la pasvorton de la malpublika klavo"
 );
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index 58adbd716a839eedd84becaeac32ecdf4a3e4ab7..748912793556d5beae493a331f12db65714fb931 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -5,18 +5,14 @@
 "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.",
+"Could not update the private key password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.",
 "Saving..." => "Guardando...",
 "Encryption" => "Cifrado",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Habilitar clave de recuperación de contraseñas ():",
-"Recovery account password" => "Recuperar contraseña",
 "Enabled" => "Habilitar",
 "Disabled" => "Deshabilitado",
-"Change encryption passwords recovery key:" => "Cambiar clave de cifrado de contraseñas:",
-"Old Recovery account password" => "Contraseña de recuperación actual",
-"New Recovery account password" => "Contraseña de recuperación nueva",
 "Change 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",
+"Enable password recovery:" => "Habilitar la recuperación de contraseña:",
 "File recovery settings updated" => "Opciones de recuperación de archivos actualizada",
 "Could not update file recovery" => "No se pudo actualizar la recuperación de archivos"
 );
diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php
index 857186a55fa219bbe69dcd5c9e33019e26f43326..e7f28e1e1f61e3814ab686926361f7506cd24861 100644
--- a/apps/files_encryption/l10n/es_AR.php
+++ b/apps/files_encryption/l10n/es_AR.php
@@ -1,4 +1,36 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Se habilitó la recuperación de archivos",
+"Could not enable recovery key. Please check your recovery key password!" => "No se pudo habilitar la clave de recuperación. Por favor, comprobá tu contraseña.",
+"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
+"Could not disable recovery key. Please check your recovery key password!" => "No fue posible deshabilitar la clave de recuperación.  Por favor, comprobá tu contraseña.",
+"Password successfully changed." => "Tu contraseña fue cambiada",
+"Could not change the password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Comprobá que la contraseña actual sea correcta.",
+"Private key password successfully updated." => "Contraseña de clave privada actualizada con éxito.",
+"Could not update the private key password. Maybe the old password was not correct." => "No fue posible actualizar la contraseña de la clave privada. Tal vez la contraseña antigua no es correcta.",
+"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada de alguna manera. Podés actualizar tu clave privada de contraseña en 'configuración personal' para tener acceso nuevamente a tus archivos",
+"PHP module OpenSSL is not installed." => "El módulo OpenSSL para PHP no está instalado.",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Pedile al administrador del servidor que instale el módulo. Por ahora la App de encriptación está deshabilitada.",
 "Saving..." => "Guardando...",
-"Encryption" => "Encriptación"
+"Your private key is not valid! Maybe the your password was changed from outside." => "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada desde afuera.",
+"You can unlock your private key in your " => "Podés desbloquear tu clave privada en tu",
+"personal settings" => "Configuración personal",
+"Encryption" => "Encriptación",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar clave de recuperación (te permite recuperar los archivos de usuario en el caso en que pierdas la contraseña):",
+"Recovery key password" => "Contraseña de recuperación de clave",
+"Enabled" => "Habilitado",
+"Disabled" => "Deshabilitado",
+"Change recovery key password:" => "Cambiar contraseña para recuperar la clave:",
+"Old Recovery key password" => "Contraseña antigua de recuperación de clave",
+"New Recovery key password" => "Nueva contraseña de recuperación de clave",
+"Change Password" => "Cambiar contraseña",
+"Your private key password no longer match your log-in password:" => "Tu contraseña de recuperación de clave ya no coincide con la contraseña de ingreso:",
+"Set your old private key password to your current log-in password." => "Usá tu contraseña de recuperación de clave antigua para tu contraseña de ingreso actual.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Si no te acordás de tu contraseña antigua, pedile al administrador que recupere tus archivos",
+"Old log-in password" => "Contraseña anterior",
+"Current log-in password" => "Contraseña actual",
+"Update Private Key Password" => "Actualizar contraseña de la clave privada",
+"Enable password recovery:" => "Habilitar contraseña de recuperación:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitando esta opción te va a permitir tener acceso a tus archivos encriptados incluso si perdés la contraseña",
+"File recovery settings updated" => "Las opciones de recuperación de archivos fueron actualizadas",
+"Could not update file recovery" => "No fue posible actualizar la recuperación de archivos"
 );
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index e762647f782f6d1ebec868c393af9c6f13b178c3..94c774636b06199c448f242f6da06410cf987a17 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -7,16 +7,9 @@
 "Could not change the password. Maybe the old password was not correct." => "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud.",
 "Saving..." => "Salvestamine...",
 "Encryption" => "Krüpteerimine",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Luba krüpteerimise paroolide taastevõti (võimalda parooli jagamine taastevõtmesse):",
-"Recovery account password" => "Konto taasteparool",
 "Enabled" => "Sisse lülitatud",
 "Disabled" => "Väljalülitatud",
-"Change encryption passwords recovery key:" => "Muuda taaste võtme krüpteerimise paroole:",
-"Old Recovery account password" => "Konto vana taaste parool",
-"New Recovery account password" => "Konto uus taasteparool",
 "Change Password" => "Muuda parooli",
-"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 98fb70691df3da3547ef4167e452c076010b4901..94d27f5501ea3a2dad9d5dfe3249b56791c44717 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -1,4 +1,29 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Clé de récupération activée avec succès",
+"Could not enable recovery key. Please check your recovery key password!" => "Ne peut pas activer la clé de récupération. s'il vous plait vérifiez votre mot de passe de clé de récupération!",
+"Recovery key successfully disabled" => "Clé de récupération désactivée avc succès",
+"Could not disable recovery key. Please check your recovery key password!" => "Ne peut pas désactiver la clé de récupération. S'il vous plait vérifiez votre mot de passe de clé de récupération!",
+"Password successfully changed." => "Mot de passe changé avec succès ",
+"Could not change the password. Maybe the old password was not correct." => "Ne peut pas changer le mot de passe. L'ancien mot de passe est peut-être incorrect.",
+"Private key password successfully updated." => "Mot de passe de la clé privé mis à jour avec succès.",
+"Could not update the private key password. Maybe the old password was not correct." => "Impossible de mettre à jour le mot de passe de la clé privé. Peut-être que l'ancien mot de passe n'était pas correcte.",
+"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "Votre clef privée est invalide ! Votre mot de passe a peut-être été modifié depuis l'extérieur. Vous pouvez mettre à jour le mot de passe de votre clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers",
 "Saving..." => "Enregistrement...",
-"Encryption" => "Chiffrement"
+"Your private key is not valid! Maybe the your password was changed from outside." => "Votre clef privée est invalide ! Votre mot de passe a peut-être été modifié depuis l'extérieur.",
+"You can unlock your private key in your " => "Vous pouvez déverrouiller votre clé privée dans votre",
+"personal settings" => "paramètres personnel",
+"Encryption" => "Chiffrement",
+"Enabled" => "Activer",
+"Disabled" => "Désactiver",
+"Change Password" => "Changer de mot de passe",
+"Your private key password no longer match your log-in password:" => "Le mot de passe de votre clef privée ne correspond plus à votre mot de passe de connexion :",
+"Set your old private key password to your current log-in password." => "Configurez le mot de passe de votre ancienne clef privée avec votre mot de passe courant de connexion. ",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Si vous ne vous souvenez plus de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers.",
+"Old log-in password" => "Ancien mot de passe de connexion",
+"Current log-in password" => "Actuel mot de passe de connexion",
+"Update Private Key Password" => "Mettre à jour le mot de passe de votre clé privée",
+"Enable password recovery:" => "Activer la récupération du mot de passe:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Activer cette option vous permettra d'obtenir à nouveau l'accès à vos fichiers chiffrés en cas de perte de mot de passe",
+"File recovery settings updated" => "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 ca93efba9aa20d76af5003a99812f6c559dc1de5..e82840fa9a2ec008292ea4bfb7c03894e602421c 100644
--- a/apps/files_encryption/l10n/gl.php
+++ b/apps/files_encryption/l10n/gl.php
@@ -5,18 +5,32 @@
 "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",
+"PHP module OpenSSL is not installed." => "O módulo PHP OpenSSL non está instalado.",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Pregúntelle ao administrador do servidor pola instalación do módulo. Polo de agora o aplicativo de cifrado foi desactivado.",
 "Saving..." => "Gardando...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior. ",
+"You can unlock your private key in your " => "Pode desbloquear a chave privada nos seus",
+"personal settings" => "axustes persoais",
 "Encryption" => "Cifrado",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activar a chave  de recuperación do cifrado de contrasinais (permite compartir a chave de recuperación):",
-"Recovery account password" => "Recuperación do contrasinal da conta",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Activar a chave de recuperación (permitirá recuperar os ficheiros dos usuarios no caso de perda do contrasinal):",
+"Recovery key password" => "Contrasinal da chave de recuperación",
 "Enabled" => "Activado",
 "Disabled" => "Desactivado",
-"Change encryption passwords recovery key:" => "Cambiar a chave de la recuperación do cifrado de contrasinais:",
-"Old Recovery account password" => "Antigo contrasinal de recuperación da conta",
-"New Recovery account password" => "Novo contrasinal de recuperación da conta",
+"Change recovery key password:" => "Cambiar o contrasinal da chave de la recuperación:",
+"Old Recovery key password" => "Antigo contrasinal da chave de recuperación",
+"New Recovery key password" => "Novo contrasinal da chave de recuperación",
 "Change Password" => "Cambiar o contrasinal",
-"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 63ae4b70b443aa145b243f3761bea1e54271ecd7..f0f2c79cc4f2a3c41f67aec316ee822d06247a66 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -5,18 +5,32 @@
 "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 ottenere nuovamente l'accesso ai file.",
+"PHP module OpenSSL is not installed." => "Il modulo PHP OpenSSL non è installato.",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Chiedi all'amministratore del server di installare il modulo. Per ora la crittografia è disabilitata.",
 "Saving..." => "Salvataggio in corso...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "La tua chiave privata non è valida! Forse è stata modifica dall'esterno.",
+"You can unlock your private key in your " => "Puoi sbloccare la chiave privata nelle tue",
+"personal settings" => "impostazioni personali",
 "Encryption" => "Cifratura",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Abilita la chiave di ripristino delle password di cifratura (consente di condividere la chiave di ripristino):",
-"Recovery account password" => "Password di ripristino dell'account",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Abilita la chiave di recupero (permette di recuperare i file utenti in caso di perdita della password):",
+"Recovery key password" => "Password della chiave di recupero",
 "Enabled" => "Abilitata",
 "Disabled" => "Disabilitata",
-"Change encryption passwords recovery key:" => "Cambia la chiave di ripristino delle password di cifratura:",
-"Old Recovery account password" => "Vecchia password di ripristino dell'account",
-"New Recovery account password" => "Nuova password di ripristino dell'account",
+"Change recovery key password:" => "Cambia la password della chiave di recupero:",
+"Old Recovery key password" => "Vecchia password della chiave di recupero",
+"New Recovery key password" => "Nuova password della chiave di recupero",
 "Change Password" => "Modifica password",
-"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 accesso:",
+"Set your old private key password to your current log-in password." => "Imposta la vecchia password della chiave privata sull'attuale password di accesso.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file.",
+"Old log-in password" => "Vecchia password di accesso",
+"Current log-in password" => "Password di accesso attuale",
+"Update Private Key Password" => "Aggiorna la password della chiave privata",
+"Enable password recovery:" => "Abilita il ripristino della password:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "L'abilitazione di questa opzione ti consentirà di accedere nuovamente ai file cifrati in caso di perdita della password",
 "File recovery settings updated" => "Impostazioni di ripristino dei file aggiornate",
 "Could not update file recovery" => "Impossibile aggiornare il ripristino dei file"
 );
diff --git a/apps/files_encryption/l10n/ja_JP.php b/apps/files_encryption/l10n/ja_JP.php
index 6d2d3e249c0b0ffc17b4e4783c41ac279a135244..b8e332672cf7500206676b5968fd636f65533177 100644
--- a/apps/files_encryption/l10n/ja_JP.php
+++ b/apps/files_encryption/l10n/ja_JP.php
@@ -5,18 +5,32 @@
 "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" => "秘密鍵が有効ではありません。パスワードが外部から変更された恐れがあります。。個人設定で秘密鍵のパスワードを更新して、ファイルへのアクセス権を奪還できます。",
+"PHP module OpenSSL is not installed." => "PHPのモジュール OpenSSLがインストールされていません。",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "サーバーの管理者にモジュールのインストールを頼んでください。さしあたり暗号化アプリは無効化されました。",
 "Saving..." => "保存中...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "秘密鍵が有効ではありません。パスワードが外部から変更された恐れがあります。",
+"You can unlock your private key in your " => "個人設定で",
+"personal settings" => "秘密鍵をアンロックできます",
 "Encryption" => "暗号化",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "暗号化パスワードの復旧キーを有効にする(復旧キーを共有することを許可):",
-"Recovery account password" => "復旧アカウントのパスワード",
+"Enable recovery key (allow to recover users files in case of password loss):" => "復旧キーを有効化 (万一パスワードを亡くした場合もユーザーのファイルを回復できる):",
+"Recovery key password" => "復旧キーのパスワード",
 "Enabled" => "有効",
 "Disabled" => "無効",
-"Change encryption passwords recovery key:" => "復旧キーの暗号化パスワードを変更:",
-"Old Recovery account password" => "古い復旧アカウントのパスワード",
-"New Recovery account password" => "新しい復旧アカウントのパスワード",
+"Change recovery key password:" => "復旧キーのパスワードを変更:",
+"Old Recovery key password" => "古い復旧キーのパスワード",
+"New Recovery key password" => "新しい復旧キーのパスワード",
 "Change Password" => "パスワードを変更",
-"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 6bc80ff44ab931bed0c3882af8fed16d37f2ff06..84fa902dc655369c802cdef1b6aeafd0da6f36af 100644
--- a/apps/files_encryption/l10n/lt_LT.php
+++ b/apps/files_encryption/l10n/lt_LT.php
@@ -1,4 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Atkūrimo raktas sėkmingai įjungtas",
+"Could not enable recovery key. Please check your recovery key password!" => "Neišėjo įjungti jūsų atkūrimo rakto. Prašome jį patikrinti!",
+"Recovery key successfully disabled" => "Atkūrimo raktas sėkmingai išjungtas",
+"Could not disable recovery key. Please check your recovery key password!" => "Neišėjo išjungti jūsų atkūrimo rakto. Prašome jį patikrinti!",
+"Password successfully changed." => "Slaptažodis sėkmingai pakeistas",
+"Could not change the password. Maybe the old password was not correct." => "Slaptažodis nebuvo pakeistas. Gali būti, kad buvo neteisingai suvestas senasis.",
 "Saving..." => "Saugoma...",
-"Encryption" => "Å ifravimas"
+"Encryption" => "Å ifravimas",
+"Enabled" => "Įjungta",
+"Disabled" => "IÅ¡jungta",
+"Change Password" => "Pakeisti 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 9c462917cf3c33374d7ad6906f88fb65ec5da34c..56b4a9bfb38759d6d197d3b96f448116ccf08b4e 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -5,18 +5,32 @@
 "Could not disable recovery key. Please check your recovery key password!" => "Kon herstelsleutel niet deactiveren. Controleer het wachtwoord van uw herstelsleutel!",
 "Password successfully changed." => "Wachtwoord succesvol gewijzigd.",
 "Could not change the password. Maybe the old password was not correct." => "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd.",
+"Private key password successfully updated." => "Privésleutel succesvol bijgewerkt.",
+"Could not update the private key password. Maybe the old password was not correct." => "Kon het wachtwoord van de privésleutel niet wijzigen. Misschien was het oude wachtwoord onjuist.",
+"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "Uw privésleutel is niet geldig! Misschien was uw wachtwoord van buitenaf gewijzigd. U kunt het wachtwoord van uw privésleutel bijwerking in uw persoonlijke instellingen om bij uw bestanden te komen.",
+"PHP module OpenSSL is not installed." => "PHP module OpenSSL is niet geïnstalleerd.",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Vraag uw beheerder deze module te installeren. Tot zolang is de crypto app gedeactiveerd.",
 "Saving..." => "Opslaan",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Uw privésleutel is niet geldig. Misschien was uw wachtwoord van buitenaf gewijzigd.",
+"You can unlock your private key in your " => "U kunt uw privésleutel deblokkeren in uw",
+"personal settings" => "persoonlijke instellingen",
 "Encryption" => "Versleuteling",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Activeer versleuteling van wachtwoorden herstelsleutel (maak delen met herstel sleutel mogelijk):",
-"Recovery account password" => "Herstel account wachtwoord",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Activeren herstelsleutel (maakt het mogelijk om gebruikersbestanden terug te halen in geval van verlies van het wachtwoord):",
+"Recovery key password" => "Wachtwoord herstelsleulel",
 "Enabled" => "Geactiveerd",
 "Disabled" => "Gedeactiveerd",
-"Change encryption passwords recovery key:" => "Wijzig versleuteling wachtwoord herstelsleutel",
-"Old Recovery account password" => "Oude herstel account wachtwoord",
-"New Recovery account password" => "Nieuwe herstel account wachtwoord",
+"Change recovery key password:" => "Wijzig wachtwoord herstelsleutel:",
+"Old Recovery key password" => "Oude wachtwoord herstelsleutel",
+"New Recovery key password" => "Nieuwe wachtwoord herstelsleutel",
 "Change Password" => "Wijzigen wachtwoord",
-"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",
+"Your private key password no longer match your log-in password:" => "Het wachtwoord van uw privésleutel komt niet meer overeen met uw inlogwachtwoord:",
+"Set your old private key password to your current log-in password." => "Stel het wachtwoord van uw oude privésleutel in op uw huidige inlogwachtwoord.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Als u uw oude wachtwoord niet meer weet, kunt u uw beheerder vragen uw bestanden terug te halen.",
+"Old log-in password" => "Oude wachtwoord",
+"Current log-in password" => "Huidige wachtwoord",
+"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 a6f90db4cd86ea74eaa47a3f736293747dbd8d6d..6a28f85994318829600d417ae59eb2024044ae1d 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -1,18 +1,31 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Klucz odzyskiwania włączony",
+"Could not enable recovery key. Please check your recovery key password!" => "Nie można włączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!",
+"Recovery key successfully disabled" => "Klucz odzyskiwania wyłączony",
+"Could not disable recovery key. Please check your recovery key password!" => "Nie można wyłączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!",
 "Password successfully changed." => "Zmiana hasła udana.",
 "Could not change the password. Maybe the old password was not correct." => "Nie można zmienić hasła. Może stare hasło nie było poprawne.",
+"Private key password successfully updated." => "Pomyślnie zaktualizowano hasło klucza prywatnego.",
+"Could not update the private key password. Maybe the old password was not correct." => "Nie można zmienić prywatnego hasła. Może stare hasło nie było poprawne.",
+"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "Klucz prywatny nie jest poprawny! Może Twoje hasło zostało zmienione z zewnątrz. Można zaktualizować hasło klucza prywatnego w ustawieniach osobistych w celu odzyskania dostępu do plików",
+"PHP module OpenSSL is not installed." => "Moduł PHP OpenSSL nie jest zainstalowany",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Proszę poproś administratora serwera aby zainstalował ten moduł. Obecnie aplikacja szyfrowanie została wyłączona.",
 "Saving..." => "Zapisywanie...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Klucz prywatny nie jest poprawny! Może Twoje hasło zostało zmienione z zewnątrz.",
+"You can unlock your private key in your " => "Możesz odblokować swój klucz prywatny w swojej",
+"personal settings" => "Ustawienia osobiste",
 "Encryption" => "Szyfrowanie",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Włącz szyfrowanie odzyskiwanych haseł klucza (zezwalaj na odzyskiwanie klucza):",
-"Recovery account password" => "Odzyskiwanie hasła konta",
 "Enabled" => "WÅ‚Ä…czone",
 "Disabled" => "Wyłączone",
-"Change encryption passwords recovery key:" => "Zmiana klucza szyfrowania haseł odzyskiwania:",
-"Old Recovery account password" => "Stare hasło odzyskiwania",
-"New Recovery account password" => "Nowe hasło odzyskiwania",
 "Change Password" => "Zmień hasło",
-"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",
+"Your private key password no longer match your log-in password:" => "Hasło klucza prywatnego nie pasuje do  hasła logowania:",
+"Set your old private key password to your current log-in password." => "Podaj swoje stare prywatne hasło aby ustawić nowe",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Jeśli nie pamiętasz swojego starego hasła, poproś swojego administratora, aby odzyskać pliki.",
+"Old log-in password" => "Stare hasło logowania",
+"Current log-in password" => "Bieżące hasło logowania",
+"Update Private Key Password" => "Aktualizacja hasła klucza prywatnego",
+"Enable password recovery:" => "Włącz hasło odzyskiwania:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "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 e5fa0b55cadae5140b0771133769456affe151e3..cb1678541bfacd506a180b74c04ccfc3989ebe56 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -5,18 +5,32 @@
 "Could not disable recovery key. Please check your recovery key password!" => "Impossível desabilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!",
 "Password successfully changed." => "Senha alterada com sucesso.",
 "Could not change the password. Maybe the old password was not correct." => "Não foi possível alterar a senha. Talvez a senha antiga não estava correta.",
+"Private key password successfully updated." => "Senha de chave privada atualizada com sucesso.",
+"Could not update the private key password. Maybe the old password was not correct." => "Não foi possível atualizar a senha de chave privada. Talvez a senha antiga esteja incorreta.",
+"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "Sua chave privada não é válida! Talvez sua senha tenha sido mudada. Você pode atualizar sua senha de chave privada nas suas configurações pessoais para obter novamente acesso aos seus arquivos.",
+"PHP module OpenSSL is not installed." => "O módulo PHP OpenSSL não está instalado.",
+"Please ask your server administrator to install the module. For now the encryption app was disabled." => "Por favor peça ao administrador do servidor para instalar o módulo. Por enquanto o app de encriptação foi desabilitada.",
 "Saving..." => "Salvando...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Sua chave privada não é válida! Talvez sua senha tenha sido mudada.",
+"You can unlock your private key in your " => "Você pode desbloquear sua chave privada nas suas",
+"personal settings" => "configurações pessoais.",
 "Encryption" => "Criptografia",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Ativar a criptografia de chave de recuperação de senhas (permitir compartilhar a chave de recuperação):",
-"Recovery account password" => "Recuperar a senha da conta",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar chave de recuperação (permite recuperar arquivos de usuários em caso de perda de senha):",
+"Recovery key password" => "Senha da chave de recuperação",
 "Enabled" => "Habilidado",
 "Disabled" => "Desabilitado",
-"Change encryption passwords recovery key:" => "Mudar a criptografia de chave de recuperação de senhas:",
-"Old Recovery account password" => "Recuperação de senha de conta antiga",
-"New Recovery account password" => "Senha Nova  da conta de Recuperação",
+"Change recovery key password:" => "Mudar a senha da chave de recuperação:",
+"Old Recovery key password" => "Senha antiga da chave de recuperação",
+"New Recovery key password" => "Nova senha da chave de recuperação",
 "Change Password" => "Trocar Senha",
-"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",
+"Your private key password no longer match your log-in password:" => "Sua senha de chave privada não coincide mais com sua senha de login:",
+"Set your old private key password to your current log-in password." => "Configure sua antiga senha de chave privada para sua atual senha de login.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Se você não se lembra de sua antiga senha você pode pedir ao administrador que recupere seus arquivos.",
+"Old log-in password" => "Senha antiga de login",
+"Current log-in password" => "Atual senha de login",
+"Update Private Key Password" => "Atualizar senha de chave privada",
+"Enable password recovery:" => "Habilitar recuperação de senha:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitar essa opção vai permitir que você obtenha novamente acesso aos seus arquivos encriptados em caso de perda de senha",
 "File recovery settings updated" => "Configurações de recuperação de arquivo atualizado",
 "Could not update file recovery" => "Não foi possível atualizar a recuperação de arquivos"
 );
diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index e1bb17ecaa7d87c7177e5fa8e8f9edd3bf64e333..f485f373a5346850da99dd461c5419859549cdb2 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -1,9 +1,15 @@
 <?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",
 "Enabled" => "Activado",
 "Disabled" => "Desactivado",
-"Change Password" => "Mudar a Password"
+"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 aaf7f0997c32d7832147bbd8a231c3393792f6a0..9b90a5110e1b056aa0159a3f7e68feadd36b44f6 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -1,18 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Ключ восстановления успешно установлен",
+"Recovery key successfully disabled" => "Ключ восстановления успешно отключен",
 "Password successfully changed." => "Пароль изменен удачно.",
 "Could not change the password. Maybe the old password was not correct." => "Невозможно изменить пароль. Возможно старый пароль не был верен.",
 "Saving..." => "Сохранение...",
+"personal settings" => "персональные настройки",
 "Encryption" => "Шифрование",
-"Enable encryption passwords recovery key (allow sharing to recovery key):" => "Включить шифрование пароля ключа восстановления (понадобится разрешение для восстановления ключа)",
-"Recovery account password" => "Восстановление пароля учетной записи",
 "Enabled" => "Включено",
 "Disabled" => "Отключено",
-"Change encryption passwords recovery key:" => "Изменить шифрование пароля ключа восстановления:",
-"Old Recovery account password" => "Старое Восстановление пароля учетной записи",
-"New Recovery account password" => "Новое Восстановление пароля учетной записи",
 "Change Password" => "Изменить пароль",
-"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" => "Включение этой опции позволит вам получить доступ к зашифрованным файлам, в случае утери пароля",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Если вы не помните свой старый пароль, вы можете попросить своего администратора восстановить ваши файлы",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Включение этой опции позволит вам получить доступ к своим зашифрованным файлам в случае утери пароля",
 "File recovery settings updated" => "Настройки файла восстановления обновлены",
 "Could not update file recovery" => "Невозможно обновить файл восстановления"
 );
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index 279481fbd4f364a889e6339cdf0c13d47072687b..b01c7f709d89ffec649ce2630c91a43d34215e92 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -1,11 +1,28 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Záchranný kľúč bol úspešne povolený",
+"Could not enable recovery key. Please check your recovery key password!" => "Nepodarilo sa povoliť záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!",
+"Recovery key successfully disabled" => "Záchranný kľúč bol úspešne zakázaný",
+"Could not disable recovery key. Please check your recovery key password!" => "Nepodarilo sa zakázať záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!",
 "Password successfully changed." => "Heslo úspešne zmenené.",
+"Could not change the password. Maybe the old password was not correct." => "Nemožno zmeniť heslo. Pravdepodobne nebolo staré heslo zadané správne.",
+"Private key password successfully updated." => "Heslo súkromného kľúča je úspešne aktualizované.",
+"Could not update the private key password. Maybe the old password was not correct." => "Nemožno aktualizovať heslo súkromného kľúča. Možno nebolo staré heslo správne.",
+"Your private key is not valid! Maybe your password was changed from outside. You can update your private key password in your personal settings to regain access to your files" => "Váš súkromný kľúč je neplatný. Možno bolo Vaše heslo zmenené z vonku. Môžete aktualizovať heslo súkromného kľúča v osobnom nastavení na opätovné získanie prístupu k súborom",
 "Saving..." => "Ukladám...",
+"Your private key is not valid! Maybe the your password was changed from outside." => "Váš súkromný kľúč je neplatný. Možno bolo Vaše heslo zmenené z vonku.",
+"personal settings" => "osobné nastavenia",
 "Encryption" => "Å ifrovanie",
 "Enabled" => "Povolené",
 "Disabled" => "Zakázané",
-"Change encryption passwords recovery key:" => "Zmeniť šifrovacie heslo obnovovacieho kľúča:",
 "Change Password" => "Zmeniť heslo",
+"Your private key password no longer match your log-in password:" => "Vaše heslo súkromného kľúča je rovnaké ako Vaše prihlasovacie heslo:",
+"Set your old private key password to your current log-in password." => "Nastavte si staré heslo súkromného kľúča k Vášmu súčasnému prihlasovaciemu heslu.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Ak si nepamätáte svoje staré heslo, môžete požiadať správcu o obnovenie svojich súborov.",
+"Old log-in password" => "Staré prihlasovacie heslo",
+"Current log-in password" => "Súčasné prihlasovacie heslo",
+"Update Private Key Password" => "Aktualizovať heslo súkromného kľúča",
+"Enable password recovery:" => "Povoliť obnovu hesla:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Povolenie Vám umožní znovu získať prístup k Vašim zašifrovaným súborom, ak stratíte heslo",
 "File recovery settings updated" => "Nastavenie obnovy súborov aktualizované",
 "Could not update file recovery" => "Nemožno aktualizovať obnovenie súborov"
 );
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index 966963b55493ef1f19259779200002767a9ecdb3..d3d317f210888227862f62e65ab4380b0733d4bc 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -1,4 +1,29 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Återställningsnyckeln har framgångsrikt aktiverats",
+"Could not enable recovery key. Please check your recovery key password!" => "Kunde inte aktivera återställningsnyckeln. Vänligen kontrollera ditt lösenord för återställningsnyckeln!",
+"Recovery key successfully disabled" => "Återställningsnyckeln har framgångsrikt inaktiverats",
+"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...",
-"Encryption" => "Kryptering"
+"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",
+"Enabled" => "Aktiverad",
+"Disabled" => "Inaktiverad",
+"Change Password" => "Byt lösenord",
+"Your private key password no longer match your log-in password:" => "Din privata lösenordsnyckel stämmer inte längre överrens med ditt inloggningslösenord:",
+"Set your old private key password to your current log-in password." => "Ställ in din gamla privata lösenordsnyckel till ditt aktuella inloggningslösenord.",
+" 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",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Genom att aktivera detta alternativ kommer du kunna återfå tillgång till dina krypterade filer om du skulle förlora/glömma ditt lösenord",
+"File recovery settings updated" => "Inställningarna för filåterställning har uppdaterats",
+"Could not update file recovery" => "Kunde inte uppdatera filåterställning"
 );
diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php
index 917ff0a0eaebb6bc6967b67e457043f7eedd6a8b..24c6fa472782376a2373f1709b05038253cb9cdc 100644
--- a/apps/files_encryption/l10n/tr.php
+++ b/apps/files_encryption/l10n/tr.php
@@ -1,4 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Kurtarma anahtarı başarıyla etkinleştirildi",
+"Could not enable recovery key. Please check your recovery key password!" => "Kurtarma anahtarı etkinleştirilemedi. Lütfen kurtarma anahtarı parolanızı kontrol edin!",
+"Recovery key successfully disabled" => "Kurtarma anahtarı başarıyla devre dışı bırakıldı",
+"Could not disable recovery key. Please check your recovery key password!" => "Kurtarma anahtarı devre dışı bırakılamadı. Lütfen kurtarma anahtarı parolanızı kontrol edin!",
+"Password successfully changed." => "Şifreniz başarıyla değiştirildi.",
+"Could not change the password. Maybe the old password was not correct." => "Parola değiştirilemedi. Eski parolanız doğru olmayabilir",
 "Saving..." => "Kaydediliyor...",
-"Encryption" => "Åžifreleme"
+"Encryption" => "Åžifreleme",
+"Enabled" => "EtkinleÅŸtirildi",
+"Disabled" => "Devre dışı",
+"Change Password" => "Parola deÄŸiÅŸtir",
+"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/vi.php b/apps/files_encryption/l10n/vi.php
index 0af5bdc9a678d886240174b835054c97c4b84d36..d11569bb94c443a971dc08716f9467a2571cdad8 100644
--- a/apps/files_encryption/l10n/vi.php
+++ b/apps/files_encryption/l10n/vi.php
@@ -1,4 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Password successfully changed." => "Đã đổi mật khẩu.",
+"Could not change the password. Maybe the old password was not correct." => "Không thể đổi mật khẩu. Có lẽ do mật khẩu cũ không đúng.",
 "Saving..." => "Đang lưu...",
-"Encryption" => "Mã hóa"
+"Encryption" => "Mã hóa",
+"Enabled" => "Bật",
+"Disabled" => "Tắt",
+"Change Password" => "Đổi Mật khẩu"
 );
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
index e565fce801c0114169f2ebde3561cbe6b9b4800a..6d6d457f439aaefab46219e9063613defa6133a9 100644
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -1,4 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "恢复密钥成功启用",
+"Could not enable recovery key. Please check your recovery key password!" => "不能启用恢复密钥。请检查恢复密钥密码！",
+"Recovery key successfully disabled" => "恢复密钥成功禁用",
+"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." => "不能修改密码。旧密码可能不正确。",
 "Saving..." => "保存中",
-"Encryption" => "加密"
+"Encryption" => "加密",
+"Enabled" => "开启",
+"Disabled" => "禁用",
+"Change Password" => "修改密码",
+"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 faea3f54a18701df5b8476efa5c36d3908b28bbc..d34f51c4870bb6ad4f4217c49b8c68e70bbe63fe 100644
--- a/apps/files_encryption/l10n/zh_TW.php
+++ b/apps/files_encryption/l10n/zh_TW.php
@@ -5,10 +5,7 @@
 "Encryption" => "加密",
 "Enabled" => "已啓用",
 "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 ddeb3590f6032c1e5822f46291f8e5e8cc247171..927064012b65de88b28d5538c8dfdb922c0a4a59 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -51,21 +51,26 @@ class Crypt {
 	 */
 	public static function createKeypair() {
 
-		$res = openssl_pkey_new(array('private_key_bits' => 4096));
-
-		// Get private key
-		openssl_pkey_export($res, $privateKey);
+		$return = false;
 
-		// Get public key
-		$publicKey = openssl_pkey_get_details($res);
+		$res = openssl_pkey_new(array('private_key_bits' => 4096));
 
-		$publicKey = $publicKey['key'];
+		if ($res === false) {
+			\OCP\Util::writeLog('Encryption library', 'couldn\'t generate users key-pair for ' . \OCP\User::getUser(), \OCP\Util::ERROR);
+		} elseif (openssl_pkey_export($res, $privateKey)) {
+			// Get public key
+			$publicKey = openssl_pkey_get_details($res);
+			$publicKey = $publicKey['key'];
 
-		return (array(
-			'publicKey' => $publicKey,
-			'privateKey' => $privateKey
-		));
+			$return = array(
+				'publicKey' => $publicKey,
+				'privateKey' => $privateKey
+			);
+		} else {
+			\OCP\Util::writeLog('Encryption library', 'couldn\'t export users private key, please check your servers openSSL configuration.' . \OCP\User::getUser(), \OCP\Util::ERROR);
+		}
 
+		return $return;
 	}
 
 	/**
@@ -168,7 +173,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 +183,7 @@ class Crypt {
 		// legacy encryption system
 		if (isset($metadata['encrypted'])
 			&& $metadata['encrypted'] === true
-			&& !self::isCatfileContent($data)
+			&& $isCatFileContent === false
 		) {
 
 			return true;
@@ -287,28 +292,22 @@ class Crypt {
 	public static function symmetricEncryptFileContent($plainContent, $passphrase = '') {
 
 		if (!$plainContent) {
-
+			\OCP\Util::writeLog('Encryption library', 'symmetrically encryption failed, no content given.', \OCP\Util::ERROR);
 			return false;
-
 		}
 
 		$iv = self::generateIv();
 
 		if ($encryptedContent = self::encrypt($plainContent, $iv, $passphrase)) {
-
 			// Combine content to encrypt with IV identifier and actual IV
 			$catfile = self::concatIv($encryptedContent, $iv);
-
 			$padded = self::addPadding($catfile);
 
 			return $padded;
 
 		} else {
-
 			\OCP\Util::writeLog('Encryption library', 'Encryption (symmetric) of keyfile content failed', \OCP\Util::ERROR);
-
 			return false;
-
 		}
 
 	}
@@ -351,6 +350,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
@@ -452,7 +479,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 +635,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 +664,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 e078ab35541154fee450f6840dde17ba607e4e93..a22c139c503cb694f859e5efec633f3f9d8423c5 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 0df34a38bd74e0e3102bebce151496e2e83d3964..735eba911a952b4adeaed4daf10b84e74b9cd17c 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 bff1737554b4bea7a231135ec6affc4d341a7fef..1911386cd12f06832d2406071a4092942191c7d7 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 072c52866445e91f7157a739ca2e939ccdc846b7..3c1eb2c5f5e5dcb4273c40040107d07a590fb18b 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 04bd4dc8aca5711678bbbef1d0c7b22ff6885de2..e8e53859bd8b621e6dc324bbbd5b22ab785a8f02 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
@@ -225,18 +228,21 @@ class Util {
 			// Generate keypair
 			$keypair = Crypt::createKeypair();
 
-			\OC_FileProxy::$enabled = false;
+			if ($keypair) {
 
-			// Save public key
-			$this->view->file_put_contents($this->publicKeyPath, $keypair['publicKey']);
+				\OC_FileProxy::$enabled = false;
 
-			// Encrypt private key with user pwd as passphrase
-			$encryptedPrivateKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], $passphrase);
+				// Encrypt private key with user pwd as passphrase
+				$encryptedPrivateKey = Crypt::symmetricEncryptFileContent($keypair['privateKey'], $passphrase);
 
-			// Save private key
-			$this->view->file_put_contents($this->privateKeyPath, $encryptedPrivateKey);
+				// Save key-pair
+				if ($encryptedPrivateKey) {
+					$this->view->file_put_contents($this->privateKeyPath, $encryptedPrivateKey);
+					$this->view->file_put_contents($this->publicKeyPath, $keypair['publicKey']);
+				}
 
-			\OC_FileProxy::$enabled = true;
+				\OC_FileProxy::$enabled = true;
+			}
 
 		} else {
 			// check if public-key exists but private-key is missing
@@ -289,7 +295,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 +308,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 +353,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 +427,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 +437,7 @@ class Util {
 						// will eat server resources :(
 						if (
 							Keymanager::getFileKey($this->view, $this->userId, $relPath)
-							&& Crypt::isCatfileContent($data)
+							&& $isEncryptedPath
 						) {
 
 							$found['encrypted'][] = array(
@@ -442,7 +447,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 +578,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 +650,7 @@ class Util {
 		return $result;
 	}
 
-	
+
 	/**
 	 * @param $path
 	 * @return bool
@@ -687,28 +694,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 +733,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 +830,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 +1053,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 +1121,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 +1131,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 +1207,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 +1269,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 +1295,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 +1320,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 +1341,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 +1389,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 +1535,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 +1551,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 3e96565949b95f3cd09ef29ae1703fa3b8bab76b..fddc3ea5eee836494eeec89e41114a2a6de86278 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 0000000000000000000000000000000000000000..5c086d6514c1297fb80d5aaea13b9cf90ff3a5ba
--- /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 18fea1845f42189f9fce958377cd5984c5e1cccb..f5f7582c2a69d141e49232f76e49e9fc14c708ac 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 recovery key (allow to recover users files in case of password loss):")); ?>
+			<br/>
+			<br/>
+			<input type="password" name="recoveryPassword" id="recoveryPassword"/>
+			<label for="recoveryPassword"><?php p($l->t("Recovery key 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 recovery key password:")); ?></strong>
+			<br/><br/>
+			<input
 				type="password"
 				name="changeRecoveryPassword"
 				id="oldRecoveryPassword"
-				<?php echo ( $_["recoveryEnabled"] == 0 ? 'disabled' : '' ); ?> />
-			<label for="oldRecoveryPassword"><?php p($l->t( "Old Recovery account password" )); ?></label>
-			<br />
-			<input 
+				<?php echo($_["recoveryEnabled"] == 0 ? 'disabled' : ''); ?> />
+			<label for="oldRecoveryPassword"><?php p($l->t("Old Recovery key password")); ?></label>
+			<br/>
+			<input
 				type="password"
 				name="changeRecoveryPassword"
 				id="newRecoveryPassword"
-				<?php echo ( $_["recoveryEnabled"] == 0 ? 'disabled' : '' ); ?> />
-			<label for="newRecoveryPassword"><?php p($l->t( "New Recovery account password" )); ?></label>
-			<br />
+				<?php echo($_["recoveryEnabled"] == 0 ? 'disabled' : ''); ?> />
+			<label for="newRecoveryPassword"><?php p($l->t("New Recovery key 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 04d6e79179ea219190ced54d76f0321ca096d1d2..38512453207a0af2ab836589d427f1abc394ef16 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 32156eea272446d8ccae2ff0aff4cc429ec58f70..9b97df22d1685932a7afba2db881b3c78a745dd8 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 40ae1659a554518590165c337789e62e25a299e6..19ba9a8117f1ce509304408afe2dd9c73c44e060 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 816bc709f26df3a2f760152506626c16cc6b1cca..6b5303158595974fb815fa1435663535b7e8c1fb 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 3d9787675428a879371aa481ab6d397c6d38c221..50ac41e4536ff6129f1806fc348c33b3845a1e14 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 29f8fb5a396a597641637d03005f550243d0ff33..ade968fbece43f931b02a65c29ef30280de59ea7 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 0dc452a41c870de813b9034d3561542202edf2ff..cb10befc8e479b3de0692f363d397de761d4da43 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 43fd6752c4ae9a1d85d4a95f4362a47cd05fcb1f..ae349bfcd3a5b18499a59b4c20d2f1e96a7c048f 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 ac408786ff6271a4088530927f2141075e495e63..3e605c59a9304491635a5b24094e3af9e6774b39 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 6706aa43a311ffde100251e5f4d1bdb1b840bb65..a84461527254965297444acf4140557e0a1666b5 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_external/l10n/ko.php b/apps/files_external/l10n/ko.php
index 47de9aad5e0ff566e4812e0f00be6136605133d6..803b489c218313cae5ce99d463eebee15e753d59 100644
--- a/apps/files_external/l10n/ko.php
+++ b/apps/files_external/l10n/ko.php
@@ -6,11 +6,14 @@
 "Error configuring Google Drive storage" => "Google 드라이브 저장소 설정 오류",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>경고:</b> \"smbclient\"가 설치되지 않았습니다. CIFS/SMB 공유 자원에 연결할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>경고:</b> PHP FTP 지원이 비활성화되어 있거나 설치되지 않았습니다. FTP 공유를 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>경고:</b> PHP Curl 지원이 비활성화되어 있거나 설치되지 않았습니다. 다른 ownCloud, WebDAV, Google 드라이브 공유를 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
 "External Storage" => "외부 저장소",
 "Folder name" => "폴더 이름",
+"External storage" => "외부 저장소",
 "Configuration" => "설정",
 "Options" => "옵션",
 "Applicable" => "적용 가능",
+"Add storage" => "저장소 추가",
 "None set" => "설정되지 않음",
 "All Users" => "모든 사용자",
 "Groups" => "그룹",
diff --git a/apps/files_external/l10n/sv.php b/apps/files_external/l10n/sv.php
index 45d3589228f614f483049cbd0faa2a3c102af7f2..80e68ab6e0645305d0440d03cd8c17372b5fb4d8 100644
--- a/apps/files_external/l10n/sv.php
+++ b/apps/files_external/l10n/sv.php
@@ -6,6 +6,7 @@
 "Error configuring Google Drive storage" => "Fel vid konfigurering av 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>Varning:</b> \"smb-klienten\" är inte installerad. Montering av CIFS/SMB delningar är inte möjligt. Kontakta din systemadministratör för att få den installerad.",
 "<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>Varning:</b> Stöd för FTP i PHP är inte aktiverat eller installerat. Montering av FTP-delningar är inte möjligt. Kontakta din systemadministratör för att få det installerat.",
+"<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>Varning:<b> Curl-stöd i PHP är inte aktiverat eller installerat. Montering av ownCloud / WebDAV eller GoogleDrive är inte möjligt. Vänligen be din administratör att installera det.",
 "External Storage" => "Extern lagring",
 "Folder name" => "Mappnamn",
 "External storage" => "Extern lagring",
diff --git a/apps/files_external/l10n/zh_CN.GB2312.php b/apps/files_external/l10n/zh_CN.GB2312.php
index c74323db1750342cdc6dee9bfe82d74115167b20..47298f8007dbfc9b2fa59ceed1e90334347f357f 100644
--- a/apps/files_external/l10n/zh_CN.GB2312.php
+++ b/apps/files_external/l10n/zh_CN.GB2312.php
@@ -6,6 +6,7 @@
 "Error configuring Google Drive storage" => "配置 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>注意：</b>“SMB客户端”未安装。CIFS/SMB分享不可用。请向您的系统管理员请求安装该客户端。",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>注意：</b>PHP的FTP支持尚未启用或未安装。FTP分享不可用。请向您的系统管理员请求安装。",
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>警告：</b> PHP 的 Curl 支持没有安装或打开。挂载 ownCloud、WebDAV 或 Google Drive 的功能将不可用。请询问您的系统管理员去安装它。",
 "External Storage" => "外部存储",
 "Folder name" => "文件夹名",
 "External storage" => "外部存储",
diff --git a/apps/files_external/tests/config.php b/apps/files_external/tests/config.php
index 1d4f30c713dd00e098172da16be1a81453f0754f..bac594b485f36d25017f8cdea63ba72c30de6990 100644
--- a/apps/files_external/tests/config.php
+++ b/apps/files_external/tests/config.php
@@ -1,4 +1,13 @@
 <?php
+
+// in case there are private configurations in the users home -> use them
+$privateConfigFile = $_SERVER['HOME'] . '/owncloud-extfs-test-config.php';
+if (file_exists($privateConfigFile)) {
+	$config = include($privateConfigFile);
+	return $config;
+}
+
+// this is now more a template now for your private configurations
 return array(
 	'ftp'=>array(
 		'run'=>false,
diff --git a/apps/files_sharing/l10n/af_ZA.php b/apps/files_sharing/l10n/af_ZA.php
index 344585a62fc16076649abc43618c0ad75195994e..04e194530b1579dd85e08b1ccdacee1964f70d0e 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 4cf3f8c092061fc4b8f842b4faa4bb35c41f7d73..768df3d16ca9c31df97bf24a87cea85beabb700c 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 ac94358c4f9690de89281d20a58ece3202fe2500..9fb9f78340b1e261e749e0a88c84f1c6069bf8d2 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 5fdf6de50c03fcdc28ec7bf5ca1ccf5b52aaa9f6..9fdfee6dfbac7b691a21f36523bb8551888b44bd 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 223495455f0e3fad598dd0a967602b3675da0c03..af924e60dd145a6152b794f7c315b4f0b774cbc3 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 9889fae488ab838432fe2a464ddff73759d01495..507955d4bd82ca80ca236a8de8844eb1c86030bf 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 dec9af4ebe988ea63011f4547f9275d5f0afaaa3..292f87a41effb4806bd0b02878b328825bab6fd2 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 75fbdabe16f0f20070e72022a8201b13658a87b1..55d70fec0521c88b9699f9158c0df3ad9878328d 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 7f4cbb1adad59c2c2792ea1856ad692b1ced313d..90fcdcf0f1bf347edc8f1caaa0348f32250fb8af 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 ab81589b0eb2b1991cec699cfdc79267b17310f7..4594c7c248d1d1990141f3d26c0c3adb4499a2a4 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 5305eedd484476a7c1f5ab5cb90d50ffb64ebffc..28360d03b4edf10bea12e1b689b49723fa0969b0 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 02ee8440487e6729fc9f21207d797bc07a4e4b53..cb40c5a168088bf194258df39224b23268a651ee 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 c598d3aa2c4ac84a3bde24f6ce48d28c377fbb36..5a216f1f1a1dc26166b962baefc796b0f9cc7801 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 2023d35903e81e7760651cc3de6db93ca61e7d7f..61794d9c5533449fb3bb497e2bf9dd39acd770da 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 a2d6e232f2077d17fefd6c91a21148ded48937e2..b079d05e52c04c0e80407a529fdae48e84abc353 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 36290ad2787e366e63a12568595dff734dd3648f..b8f6b5ab067ad620f693931ead031ff529e75b9e 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 ebef0f445edf2d6526cb4aaa8f3e4a85310468f0..614cdc1717def2aeb36a88922f73e1c0da109e16 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 4313acae1ade0b40194270336fcd1ffe16eb0aee..d91daa90ebcc03e46c52e40c2307f54330715bbf 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 6c441342133e171f691816548ce73e13e7c77b5f..7e9b67de2ca2e0f6ecf7c6fd98e27f66d0d8f381 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 1038d819330557bf3082562b67ffbba0bb39acdf..b4657978f790c2538bf40d0098903875f8700bde 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 d03f1a5005f49542b65b8637c6bc71221687e4b2..90f7a22127476048dd6a06e21b0eab0b8b3a75b6 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 2ea5ba76ab162e1ec6f7098e77525eb03e9ad128..d0c75e6ba5427160dc096f8c9c6bf278b3f69a65 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 b2dca866bbd8e13b7f653e77a8296769ed1f331c..1d09d09bf5cc8c11d07482896cdbf763ccaddc15 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 f8ca541260d10676aaf4c2733d4e59aae2e7f8ba..7184cfa4b3791c57c9b7e7c556adba9a83e9c0eb 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 d229135a71d89304766a4a846e2d073e4eb25e62..7db49518a4b5b0a5de875e6732fa10a1e6b003ec 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 95cf84312cdb68be3bcced840cbc3bd6e1f2ff11..e27e78b5f6c42e35223431fca8db99d5c44d8350 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 bf1975c54ae271bb86a7b6b3b7ee0d4d08fd05a2..b76d737e6d0bafed22cf183914a099b48ddd8a06 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 f83ca1446d604b45fc54381999ded0cfdb84d37b..60a1e588e82e0ddcfaaaccf1acdbbfc191dcd041 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 02142e2879a98de6b3836b94d8097f1c0e49439d..8f208da10c95e028c2814488f04f6a6dcb7b05f0 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 6da1a8b019d4d823b763acf73779636fc69c807e..4577148d7df63ec0e3113761a60536cec0a24e63 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 600168d9bfa86e73c16ea8ed44fd88383cf30e13..394c8d12b21398d2069c68b3ce4054b8bd7469dd 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 675fc372e1527a24eadcd2d14e82bc5f5f118bd9..4a0b53f6c8391ff5474aa0a856cbd2ffd7b1cdb3 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 630866ab4c572cebb05745bc333ff925a9f89470..502f934cad0ac80c996010a86b529074afe81e8c 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 96ab48cd2c53377218b351872305ea70944de9f8..2e09aa206d120f1bf22feeb8a52d74cd942c17ca 100644
--- a/apps/files_sharing/l10n/lt_LT.php
+++ b/apps/files_sharing/l10n/lt_LT.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Slaptažodis",
 "Submit" => "IÅ¡saugoti",
+"%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",
-"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 88faeaf9f11fed7fbf054b1c8ea65970f3be9882..8430f99e6cf9ec3f5551847cdb99cb7744bc551c 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 16c7ee0eb04e6563db792422483bf61f56133262..3d6e54f52b2656dced287eac073424e7a6afd215 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 879524afce3cc02d199e80fb415e05c7d05df3b1..5a1cb1018cc9cb9e0daf7154562f7917f15f8110 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 dc7ec17e9c58249113282639cac8aa27f1c2b42a..4b37ab8b48a75365370546eab07a0037df38d5f8 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 4934c3410674c405f4ea58e4dcc9c3113e0a183c..027a07babe310734b348c6f06817640d5d4d1892 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 2cef02543983744447bd92397d32038b22fcfcbe..837547e16b1e9be0d7d5844ce0fc6474bbd5fea2 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 aeba545dabc1d1a634b989fbbe5274ef680e7b4e..328fb038b88e6ad39d5f64fbca5e16eeb3261762 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 07bc26ecdd4f35c6f532758ee775511d1b635136..2fe0c95aa7604844023af46c4ee6d0f2bbd8df24 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 9db5e87c9ba907f9e81e8f8ec09ad8a82cf9e415..c85a11863bd9971ce667c8ad2195a7ccfb70f8f0 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 ce4c28ddcb5aa6620cff971dcc2e01dd7d52c2fc..a5dad793c4e67a2e7814284680e2ddc8c051c20b 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 43e8f3c4b69f4b5ec8f10af372e97e7150f40da0..de8fcbf02d9a6a67c12100ee544fb0a4c310f339 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 eb9977dc585ce0efafa7fac2e50d1b96a401322a..8b8eab13541fe97d740f121a70ffc9cd1026bd54 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 7fd116e0aae8cca19012b1635167289966c18ca4..066096f5b5a77f986959e30941fdcaeba3e0984d 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 580f7b1990a01502cfdfd38895bbfb75c7eded2a..b9bcab28c959ec6e788caac063bce9ffabf4d964 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 14124eeb8745f3c1d976dd881f22065c455c0d30..0907e3b451c15a05de66200cfb9ffe840c3c490e 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 6bcbb0070b35239b8093856433c3c92c8cb2dc79..ae84c4728920f1f50b8af5bce07e55eb9e9dc133 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 244ca87c552770ddb3824fcd05d7edfa6e4ac2c5..7be5f560faadd3006acbe15d37a5267a4e1c358f 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 be24c06e465c4e57f0f5876498dcf9ba61c353d2..6e277f677119ce3b1f1373b57267142b73463d4c 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 d1c9afff07cf362bb5b2c4c26b424a2e6a4a64a9..af21d869adc0abfc5000375a2644d9cb5a55ef83 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 6cf6f6236b7ac0adf86cf4d62278b41441938a35..6b2ac30bcd4caf75f916744cd6f1ec8e84094758 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 9d53d65f8ab607351a539fbed0c45faeae2ac748..e16ecea96eff141d603cf3100c80f331ab8ab2bf 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 42dfec8cc6f0a08d1a85dc73c1476e1715da2966..4de33557382cdd7fbdcf1423cb58e721c561fba7 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 8e1fa4bc980892d9e7d6531b2611ad835934da62..207988ef73224003399a733a3e10bf0fbc6c023d 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 f68b714350f8a7b318978c7110586c8c58bdae4d..745f2f930d193b6c5ab9142a040ea800afa902a1 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 afeec5c648132a26106ecd7e9d805e378f7edfe0..2a5a2ff17f15531dd974fddb3aa3c3d2fd42ecf7 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 117ec8f4065b819699067223bb57fc2fe24e6447..7df3ee8f9b1fcd23d24ad388ff53bb1036dd1c6e 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 64e7af3e0cdc1bd4f8301ff4334c7c45b9713486..15c1bb54873093a5b6c0c6845757afea749abadb 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 14e4466ecb6183396ad5a6a895a7d501e2971c67..23b27789943b2669e70fe0bbdafec94e7073612a 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 88a4cc242ba6c3442faa47de41a119d333548ce8..adf3c3e9cc823459d6e12e61390e85372587cc04 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/l10n/bg_BG.php b/apps/files_trashbin/l10n/bg_BG.php
index 288518e1a41320914d5abee9cae4a70af6460318..1e0953b013a5657a5b8d0f40baa7e1904435927b 100644
--- a/apps/files_trashbin/l10n/bg_BG.php
+++ b/apps/files_trashbin/l10n/bg_BG.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Невъзможно изтриване на %s завинаги",
+"Couldn't delete %s permanently" => "Невъзможно перманентното изтриване на %s",
 "Couldn't restore %s" => "Невъзможно възтановяване на %s",
 "perform restore operation" => "извършване на действие по възстановяване",
 "Error" => "Грешка",
diff --git a/apps/files_trashbin/l10n/eo.php b/apps/files_trashbin/l10n/eo.php
index 3288c4fcdc56187e88df52df3e501e71e3cb3848..161e9c3e88ac110eac7d7d2ec79938ed755a3506 100644
--- a/apps/files_trashbin/l10n/eo.php
+++ b/apps/files_trashbin/l10n/eo.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Error" => "Eraro",
+"Delete permanently" => "Forigi por ĉiam",
 "Name" => "Nomo",
 "1 folder" => "1 dosierujo",
 "{count} folders" => "{count} dosierujoj",
diff --git a/apps/files_trashbin/l10n/he.php b/apps/files_trashbin/l10n/he.php
index e31fdb952ea85e061b8f683237603aea819fede3..853d4e1925abe81b00b9ba51d8f5f122f74426b0 100644
--- a/apps/files_trashbin/l10n/he.php
+++ b/apps/files_trashbin/l10n/he.php
@@ -1,17 +1,18 @@
 <?php $TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "בלתי אפשרי למחוק את %s לצמיתות",
-"Couldn't restore %s" => "בלתי אפשרי לשחזר את %s",
-"perform restore operation" => "בצע פעולת שחזור",
+"Couldn't delete %s permanently" => "לא ניתן למחוק את %s לצמיתות",
+"Couldn't restore %s" => "לא ניתן לשחזר את %s",
+"perform restore operation" => "ביצוע פעולת שחזור",
 "Error" => "שגיאה",
-"delete file permanently" => "מחק קובץ לצמיתות",
-"Delete permanently" => "מחק לצמיתות",
+"delete file permanently" => "מחיקת קובץ לצמיתות",
+"Delete permanently" => "מחיקה לצמיתות",
 "Name" => "שם",
 "Deleted" => "נמחק",
 "1 folder" => "תיקייה אחת",
 "{count} folders" => "{count} תיקיות",
 "1 file" => "קובץ אחד",
 "{count} files" => "{count} קבצים",
-"Nothing in here. Your trash bin is empty!" => "שום דבר כאן. סל המחזור שלך ריק!",
-"Restore" => "שחזר",
-"Delete" => "מחיקה"
+"Nothing in here. Your trash bin is empty!" => "אין כאן שום דבר. סל המיחזור שלך ריק!",
+"Restore" => "שחזור",
+"Delete" => "מחיקה",
+"Deleted Files" => "קבצים שנמחקו"
 );
diff --git a/apps/files_trashbin/l10n/lt_LT.php b/apps/files_trashbin/l10n/lt_LT.php
index 011de161e425ebf70062567de246b3e2c384340e..7df63bd7f28b94c5bda6aa4cffdb1a10c8bbc5ed 100644
--- a/apps/files_trashbin/l10n/lt_LT.php
+++ b/apps/files_trashbin/l10n/lt_LT.php
@@ -1,9 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "Nepavyko negrįžtamai ištrinti %s",
+"Couldn't restore %s" => "Nepavyko atkurti %s",
+"perform restore operation" => "atkurti",
 "Error" => "Klaida",
+"delete file permanently" => "failą ištrinti negrįžtamai",
+"Delete permanently" => "Ištrinti negrįžtamai",
 "Name" => "Pavadinimas",
+"Deleted" => "IÅ¡trinti",
 "1 folder" => "1 aplankalas",
 "{count} folders" => "{count} aplankalai",
 "1 file" => "1 failas",
 "{count} files" => "{count} failai",
-"Delete" => "IÅ¡trinti"
+"Nothing in here. Your trash bin is empty!" => "Nieko nėra. Jūsų šiukšliadėžė tuščia!",
+"Restore" => "Atstatyti",
+"Delete" => "IÅ¡trinti",
+"Deleted Files" => "IÅ¡trinti failai"
 );
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index 2d1830a38f1b4a8e10e575dab4cfc2b5222fdb49..1235d9d2ee07234807720e37f757afdb08de499c 100644
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -24,17 +24,18 @@ namespace OCA\Files_Trashbin;
 
 class Trashbin {
 	// how long do we keep files in the trash bin if no other value is defined in the config file (unit: days)
-	const DEFAULT_RETENTION_OBLIGATION=180;
+
+	const DEFAULT_RETENTION_OBLIGATION = 180;
 
 	// unit: percentage; 50% of available disk space/quota
-	const DEFAULTMAXSIZE=50;
+	const DEFAULTMAXSIZE = 50;
 
 	public static function getUidAndFilename($filename) {
 		$uid = \OC\Files\Filesystem::getOwner($filename);
 		\OC\Files\Filesystem::initMountPoints($uid);
-		if ( $uid != \OCP\User::getUser() ) {
+		if ($uid != \OCP\User::getUser()) {
 			$info = \OC\Files\Filesystem::getFileInfo($filename);
-			$ownerView = new \OC\Files\View('/'.$uid.'/files');
+			$ownerView = new \OC\Files\View('/' . $uid . '/files');
 			$filename = $ownerView->getPath($info['fileid']);
 		}
 		return array($uid, $filename);
@@ -47,115 +48,119 @@ class Trashbin {
 	 */
 	public static function move2trash($file_path) {
 		$user = \OCP\User::getUser();
-		$view = new \OC\Files\View('/'. $user);
+		$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'];
 		$location = $path_parts['dirname'];
 		$timestamp = time();
-		$mime = $view->getMimeType('files'.$file_path);
+		$mime = $view->getMimeType('files' . $file_path);
 
-		if ( $view->is_dir('files'.$file_path) ) {
+		if ($view->is_dir('files' . $file_path)) {
 			$type = 'dir';
 		} else {
 			$type = 'file';
 		}
-		
+
 		$trashbinSize = self::getTrashbinSize($user);
-		if ( $trashbinSize === false || $trashbinSize < 0 ) {
-			$trashbinSize = self::calculateSize(new \OC\Files\View('/'. $user.'/files_trashbin'));
+		if ($trashbinSize === false || $trashbinSize < 0) {
+			$trashbinSize = self::calculateSize(new \OC\Files\View('/' . $user . '/files_trashbin'));
 		}
 
 		// disable proxy to prevent recursive calls
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
-		$sizeOfAddedFiles = self::copy_recursive($file_path, 'files_trashbin/files/'.$filename.'.d'.$timestamp, $view);
+		$sizeOfAddedFiles = self::copy_recursive($file_path, 'files_trashbin/files/' . $filename . '.d' . $timestamp, $view);
 		\OC_FileProxy::$enabled = $proxyStatus;
 
-		if ( $view->file_exists('files_trashbin/files/'.$filename.'.d'.$timestamp) ) {
+		if ($view->file_exists('files_trashbin/files/' . $filename . '.d' . $timestamp)) {
 			$trashbinSize += $sizeOfAddedFiles;
 			$query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`type`,`mime`,`user`) VALUES (?,?,?,?,?,?)");
 			$result = $query->execute(array($filename, $timestamp, $location, $type, $mime, $user));
-			if ( !$result ) { // if file couldn't be added to the database than also don't store it in the trash bin.
-				$view->deleteAll('files_trashbin/files/'.$filename.'.d'.$timestamp);
+			if (!$result) { // if file couldn't be added to the database than also don't store it in the trash bin.
+				$view->deleteAll('files_trashbin/files/' . $filename . '.d' . $timestamp);
 				\OC_Log::write('files_trashbin', 'trash bin database couldn\'t be updated', \OC_log::ERROR);
 				return;
 			}
-			\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_moveToTrash',
-					array('filePath' => \OC\Files\Filesystem::normalizePath($file_path),
-							'trashPath' => \OC\Files\Filesystem::normalizePath($filename.'.d'.$timestamp)));
+			\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_moveToTrash', array('filePath' => \OC\Files\Filesystem::normalizePath($file_path),
+				'trashPath' => \OC\Files\Filesystem::normalizePath($filename . '.d' . $timestamp)));
 
 			$trashbinSize += self::retainVersions($view, $file_path, $filename, $timestamp);
 			$trashbinSize += self::retainEncryptionKeys($view, $file_path, $filename, $timestamp);
-
 		} else {
-			\OC_Log::write('files_trashbin', 'Couldn\'t move '.$file_path.' to the trash bin', \OC_log::ERROR);
+			\OC_Log::write('files_trashbin', 'Couldn\'t move ' . $file_path . ' to the trash bin', \OC_log::ERROR);
 		}
 
 		$trashbinSize -= self::expire($trashbinSize);
-		
-		self::setTrashbinSize($user, $trashbinSize);
 
+		self::setTrashbinSize($user, $trashbinSize);
 	}
 
-    /**
-     * Move file versions to trash so that they can be restored later
-     *
-     * @param \OC\Files\View $view
-     * @param $file_path path to original file
-     * @param $filename of deleted file
-     * @param $timestamp when the file was deleted
-     *
-     * @return size of stored versions
-     */
+	/**
+	 * Move file versions to trash so that they can be restored later
+	 *
+	 * @param \OC\Files\View $view
+	 * @param $file_path path to original file
+	 * @param $filename of deleted file
+	 * @param $timestamp when the file was deleted
+	 *
+	 * @return size of stored versions
+	 */
 	private static function retainVersions($view, $file_path, $filename, $timestamp) {
 		$size = 0;
-        if (\OCP\App::isEnabled('files_versions')) {
+		if (\OCP\App::isEnabled('files_versions')) {
 
-            // disable proxy to prevent recursive calls
-            $proxyStatus = \OC_FileProxy::$enabled;
-            \OC_FileProxy::$enabled = false;
+			// disable proxy to prevent recursive calls
+			$proxyStatus = \OC_FileProxy::$enabled;
+			\OC_FileProxy::$enabled = false;
 
-            $user = \OCP\User::getUser();
+			$user = \OCP\User::getUser();
 			$rootView = new \OC\Files\View('/');
 
 			list($owner, $ownerPath) = self::getUidAndFilename($file_path);
 
-			if ($rootView->is_dir($owner.'/files_versions/' . $ownerPath)) {
-                $size += self::calculateSize(new \OC\Files\View('/' . $owner . '/files_versions/' . $ownerPath));
-                $rootView->rename($owner.'/files_versions/' . $ownerPath, $user.'/files_trashbin/versions/' . $filename . '.d' . $timestamp);
+			if ($rootView->is_dir($owner . '/files_versions/' . $ownerPath)) {
+				$size += self::calculateSize(new \OC\Files\View('/' . $owner . '/files_versions/' . $ownerPath));
+				$rootView->rename($owner . '/files_versions/' . $ownerPath, $user . '/files_trashbin/versions/' . $filename . '.d' . $timestamp);
 			} else if ($versions = \OCA\Files_Versions\Storage::getVersions($owner, $ownerPath)) {
-                foreach ($versions as $v) {
-					$size += $rootView->filesize($owner.'/files_versions' . $v['path'] . '.v' . $v['version']);
-                	$rootView->rename($owner.'/files_versions' . $v['path'] . '.v' . $v['version'], $user.'/files_trashbin/versions/' . $filename . '.v' . $v['version'] . '.d' . $timestamp);
+				foreach ($versions as $v) {
+					$size += $rootView->filesize($owner . '/files_versions' . $v['path'] . '.v' . $v['version']);
+					$rootView->rename($owner . '/files_versions' . $v['path'] . '.v' . $v['version'], $user . '/files_trashbin/versions/' . $filename . '.v' . $v['version'] . '.d' . $timestamp);
 				}
 			}
 
-            // enable proxy
-            \OC_FileProxy::$enabled = $proxyStatus;
+			// enable proxy
+			\OC_FileProxy::$enabled = $proxyStatus;
 		}
 
 		return $size;
 	}
 
-    /**
-     * Move encryption keys to trash so that they can be restored later
-     *
-     * @param \OC\Files\View $view
-     * @param $file_path path to original file
-     * @param $filename of deleted file
-     * @param $timestamp when the file was deleted
-     *
-     * @return size of encryption keys
-     */
+	/**
+	 * Move encryption keys to trash so that they can be restored later
+	 *
+	 * @param \OC\Files\View $view
+	 * @param $file_path path to original file
+	 * @param $filename of deleted file
+	 * @param $timestamp when the file was deleted
+	 *
+	 * @return size of encryption keys
+	 */
 	private static function retainEncryptionKeys($view, $file_path, $filename, $timestamp) {
 		$size = 0;
 
@@ -167,65 +172,65 @@ class Trashbin {
 			list($owner, $ownerPath) = self::getUidAndFilename($file_path);
 
 
-            // disable proxy to prevent recursive calls
-            $proxyStatus = \OC_FileProxy::$enabled;
-            \OC_FileProxy::$enabled = false;
+			// disable proxy to prevent recursive calls
+			$proxyStatus = \OC_FileProxy::$enabled;
+			\OC_FileProxy::$enabled = false;
 
-            // retain key files
-			$keyfile = \OC\Files\Filesystem::normalizePath($owner.'/files_encryption/keyfiles/' . $ownerPath);
+			// retain key files
+			$keyfile = \OC\Files\Filesystem::normalizePath($owner . '/files_encryption/keyfiles/' . $ownerPath);
 
-            if ($rootView->is_dir($keyfile) || $rootView->file_exists($keyfile . '.key')) {
-                // move keyfiles
-			    if ($rootView->is_dir($keyfile)) {
-                    $size += self::calculateSize(new \OC\Files\View($keyfile));
-					$rootView->rename($keyfile, $user.'/files_trashbin/keyfiles/' . $filename . '.d' . $timestamp);
+			if ($rootView->is_dir($keyfile) || $rootView->file_exists($keyfile . '.key')) {
+				// move keyfiles
+				if ($rootView->is_dir($keyfile)) {
+					$size += self::calculateSize(new \OC\Files\View($keyfile));
+					$rootView->rename($keyfile, $user . '/files_trashbin/keyfiles/' . $filename . '.d' . $timestamp);
 				} else {
 					$size += $rootView->filesize($keyfile . '.key');
-            		$rootView->rename($keyfile . '.key', $user.'/files_trashbin/keyfiles/' . $filename . '.key.d' . $timestamp);
+					$rootView->rename($keyfile . '.key', $user . '/files_trashbin/keyfiles/' . $filename . '.key.d' . $timestamp);
 				}
 			}
 
-            // retain share keys
-			$sharekeys = \OC\Files\Filesystem::normalizePath($owner.'/files_encryption/share-keys/' . $ownerPath);
+			// retain share keys
+			$sharekeys = \OC\Files\Filesystem::normalizePath($owner . '/files_encryption/share-keys/' . $ownerPath);
 
 			if ($rootView->is_dir($sharekeys)) {
 				$size += self::calculateSize(new \OC\Files\View($sharekeys));
-				$rootView->rename($sharekeys, $user.'/files_trashbin/share-keys/' . $filename . '.d' . $timestamp);
+				$rootView->rename($sharekeys, $user . '/files_trashbin/share-keys/' . $filename . '.d' . $timestamp);
 			} else {
-                // get local path to share-keys
-                $localShareKeysPath = $rootView->getLocalFile($sharekeys);
+				// get local path to share-keys
+				$localShareKeysPath = $rootView->getLocalFile($sharekeys);
+				$escapedLocalShareKeysPath = preg_replace('/(\*|\?|\[)/', '[$1]', $localShareKeysPath);
 
-                // handle share-keys
-                $matches = glob(preg_quote($localShareKeysPath).'*.shareKey');
-                foreach ($matches as $src) {
-                    // get source file parts
-                    $pathinfo = pathinfo($src);
+				// handle share-keys
+				$matches = glob($escapedLocalShareKeysPath . '*.shareKey');
+				foreach ($matches as $src) {
+					// get source file parts
+					$pathinfo = pathinfo($src);
 
-                    // we only want to keep the owners key so we can access the private key
-                    $ownerShareKey = $filename . '.' . $user. '.shareKey';
+					// we only want to keep the owners key so we can access the private key
+					$ownerShareKey = $filename . '.' . $user . '.shareKey';
 
-                    // if we found the share-key for the owner, we need to move it to files_trashbin
-                    if($pathinfo['basename'] == $ownerShareKey) {
+					// if we found the share-key for the owner, we need to move it to files_trashbin
+					if ($pathinfo['basename'] == $ownerShareKey) {
 
-                        // calculate size
-                        $size += $rootView->filesize($sharekeys. '.' . $user. '.shareKey');
+						// calculate size
+						$size += $rootView->filesize($sharekeys . '.' . $user . '.shareKey');
 
-                        // move file
-                        $rootView->rename($sharekeys. '.' . $user. '.shareKey', $user.'/files_trashbin/share-keys/' . $ownerShareKey . '.d' . $timestamp);
-                    } else {
+						// move file
+						$rootView->rename($sharekeys . '.' . $user . '.shareKey', $user . '/files_trashbin/share-keys/' . $ownerShareKey . '.d' . $timestamp);
+					} else {
 
-                        // calculate size
-                        $size += filesize($src);
-                        
-                        // don't keep other share-keys
-                        unlink($src);
-                    }
-                }
+						// calculate size
+						$size += filesize($src);
 
-            }
+						// don't keep other share-keys
+						unlink($src);
+					}
+				}
+			}
 
-            // enable proxy
-            \OC_FileProxy::$enabled = $proxyStatus;
+			// enable proxy
+			\OC_FileProxy::$enabled = $proxyStatus;
 		}
 		return $size;
 	}
@@ -235,95 +240,94 @@ class Trashbin {
 	 * @param $file path to the deleted file
 	 * @param $filename name of the file
 	 * @param $timestamp time when the file was deleted
-     *
-     * @return bool
-     */
+	 *
+	 * @return bool
+	 */
 	public static function restore($file, $filename, $timestamp) {
 
-        $user = \OCP\User::getUser();
-		$view = new \OC\Files\View('/'.$user);
-		
+		$user = \OCP\User::getUser();
+		$view = new \OC\Files\View('/' . $user);
+
 		$trashbinSize = self::getTrashbinSize($user);
-		if ( $trashbinSize === false || $trashbinSize < 0 ) {
-			$trashbinSize = self::calculateSize(new \OC\Files\View('/'. $user.'/files_trashbin'));
+		if ($trashbinSize === false || $trashbinSize < 0) {
+			$trashbinSize = self::calculateSize(new \OC\Files\View('/' . $user . '/files_trashbin'));
 		}
-		if ( $timestamp ) {
+		if ($timestamp) {
 			$query = \OC_DB::prepare('SELECT `location`,`type` FROM `*PREFIX*files_trash`'
-				.' WHERE `user`=? AND `id`=? AND `timestamp`=?');
-			$result = $query->execute(array($user,$filename,$timestamp))->fetchAll();
-			if ( count($result) != 1 ) {
+					. ' WHERE `user`=? AND `id`=? AND `timestamp`=?');
+			$result = $query->execute(array($user, $filename, $timestamp))->fetchAll();
+			if (count($result) != 1) {
 				\OC_Log::write('files_trashbin', 'trash bin database inconsistent!', \OC_Log::ERROR);
 				return false;
 			}
 
 			// if location no longer exists, restore file in the root directory
 			$location = $result[0]['location'];
-			if ( $result[0]['location'] != '/' &&
-				(!$view->is_dir('files'.$result[0]['location']) ||
-				 !$view->isUpdatable('files'.$result[0]['location'])) ) {
+			if ($result[0]['location'] != '/' &&
+				(!$view->is_dir('files' . $result[0]['location']) ||
+				!$view->isUpdatable('files' . $result[0]['location']))) {
 				$location = '';
 			}
 		} else {
 			$path_parts = pathinfo($file);
 			$result[] = array(
-					'location' => $path_parts['dirname'],
-					'type' => $view->is_dir('/files_trashbin/files/'.$file) ? 'dir' : 'files',
-					);
+				'location' => $path_parts['dirname'],
+				'type' => $view->is_dir('/files_trashbin/files/' . $file) ? 'dir' : 'files',
+			);
 			$location = '';
 		}
-		
-		$source = \OC\Files\Filesystem::normalizePath('files_trashbin/files/'.$file);
-		$target = \OC\Files\Filesystem::normalizePath('files/'.$location.'/'.$filename);
+
+		$source = \OC\Files\Filesystem::normalizePath('files_trashbin/files/' . $file);
+		$target = \OC\Files\Filesystem::normalizePath('files/' . $location . '/' . $filename);
 
 		// we need a  extension in case a file/dir with the same name already exists
 		$ext = self::getUniqueExtension($location, $filename, $view);
 		$mtime = $view->filemtime($source);
 
-        // disable proxy to prevent recursive calls
-        $proxyStatus = \OC_FileProxy::$enabled;
-        \OC_FileProxy::$enabled = false;
+		// disable proxy to prevent recursive calls
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
 
-        // restore file
-        $restoreResult = $view->rename($source, $target.$ext);
+		// restore file
+		$restoreResult = $view->rename($source, $target . $ext);
 
-        // handle the restore result
-        if( $restoreResult ) {
+		// handle the restore result
+		if ($restoreResult) {
 			$fakeRoot = $view->getRoot();
-			$view->chroot('/'.$user.'/files');
-			$view->touch('/'.$location.'/'.$filename.$ext, $mtime);
+			$view->chroot('/' . $user . '/files');
+			$view->touch('/' . $location . '/' . $filename . $ext, $mtime);
 			$view->chroot($fakeRoot);
-			\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', 
-					array('filePath' => \OC\Files\Filesystem::normalizePath('/'.$location.'/'.$filename.$ext),
-							'trashPath' => \OC\Files\Filesystem::normalizePath($file)));
-			if ($view->is_dir($target.$ext)) {
-				$trashbinSize -= self::calculateSize(new \OC\Files\View('/'.$user.'/'.$target.$ext));
+			\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', array('filePath' => \OC\Files\Filesystem::normalizePath('/' . $location . '/' . $filename . $ext),
+				'trashPath' => \OC\Files\Filesystem::normalizePath($file)));
+			if ($view->is_dir($target . $ext)) {
+				$trashbinSize -= self::calculateSize(new \OC\Files\View('/' . $user . '/' . $target . $ext));
 			} else {
-				$trashbinSize -= $view->filesize($target.$ext);
+				$trashbinSize -= $view->filesize($target . $ext);
 			}
 
-            $trashbinSize -= self::restoreVersions($view, $file, $filename, $ext, $location, $timestamp);
+			$trashbinSize -= self::restoreVersions($view, $file, $filename, $ext, $location, $timestamp);
 			$trashbinSize -= self::restoreEncryptionKeys($view, $file, $filename, $ext, $location, $timestamp);
 
-			if ( $timestamp ) {
+			if ($timestamp) {
 				$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=? AND `id`=? AND `timestamp`=?');
-				$query->execute(array($user,$filename,$timestamp));
+				$query->execute(array($user, $filename, $timestamp));
 			}
 
 			self::setTrashbinSize($user, $trashbinSize);
 
-            // enable proxy
-            \OC_FileProxy::$enabled = $proxyStatus;
+			// enable proxy
+			\OC_FileProxy::$enabled = $proxyStatus;
 
 			return true;
 		}
 
-        // enable proxy
-        \OC_FileProxy::$enabled = $proxyStatus;
+		// enable proxy
+		\OC_FileProxy::$enabled = $proxyStatus;
 
 		return false;
 	}
 
-    /**
+	/**
 	 * @brief restore versions from trash bin
 	 *
 	 * @param \OC\Files\View $view file view
@@ -332,20 +336,20 @@ class Trashbin {
 	 * @param $ext file extension in case a file with the same $filename already exists
 	 * @param $location location if file
 	 * @param $timestamp deleteion time
-     *
+	 *
 	 * @return size of restored versions
 	 */
 	private static function restoreVersions($view, $file, $filename, $ext, $location, $timestamp) {
 		$size = 0;
 		if (\OCP\App::isEnabled('files_versions')) {
-            // disable proxy to prevent recursive calls
-            $proxyStatus = \OC_FileProxy::$enabled;
-            \OC_FileProxy::$enabled = false;
+			// disable proxy to prevent recursive calls
+			$proxyStatus = \OC_FileProxy::$enabled;
+			\OC_FileProxy::$enabled = false;
 
-            $user = \OCP\User::getUser();
+			$user = \OCP\User::getUser();
 			$rootView = new \OC\Files\View('/');
 
-			$target = \OC\Files\Filesystem::normalizePath('/'.$location.'/'.$filename.$ext);
+			$target = \OC\Files\Filesystem::normalizePath('/' . $location . '/' . $filename . $ext);
 
 			list($owner, $ownerPath) = self::getUidAndFilename($target);
 
@@ -355,190 +359,188 @@ class Trashbin {
 				$versionedFile = $file;
 			}
 
-            if ($view->is_dir('/files_trashbin/versions/'.$file)) {
+			if ($view->is_dir('/files_trashbin/versions/' . $file)) {
 				$size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . 'files_trashbin/versions/' . $file));
-            	$rootView->rename(\OC\Files\Filesystem::normalizePath($user.'/files_trashbin/versions/' . $file), \OC\Files\Filesystem::normalizePath($owner.'/files_versions/' . $ownerPath));
+				$rootView->rename(\OC\Files\Filesystem::normalizePath($user . '/files_trashbin/versions/' . $file), \OC\Files\Filesystem::normalizePath($owner . '/files_versions/' . $ownerPath));
 			} else if ($versions = self::getVersionsFromTrash($versionedFile, $timestamp)) {
-                foreach ($versions as $v) {
-            		if ($timestamp) {
-            			$size += $view->filesize('files_trashbin/versions/' . $versionedFile . '.v' . $v . '.d' . $timestamp);
-                        $rootView->rename($user.'/files_trashbin/versions/' . $versionedFile . '.v' . $v . '.d' . $timestamp, $owner.'/files_versions/' . $ownerPath . '.v' . $v);
+				foreach ($versions as $v) {
+					if ($timestamp) {
+						$size += $view->filesize('files_trashbin/versions/' . $versionedFile . '.v' . $v . '.d' . $timestamp);
+						$rootView->rename($user . '/files_trashbin/versions/' . $versionedFile . '.v' . $v . '.d' . $timestamp, $owner . '/files_versions/' . $ownerPath . '.v' . $v);
 					} else {
-            			$size += $view->filesize('files_trashbin/versions/' . $versionedFile . '.v' . $v);
-						$rootView->rename($user.'/files_trashbin/versions/' . $versionedFile . '.v' . $v, $owner.'/files_versions/' . $ownerPath . '.v' . $v);
+						$size += $view->filesize('files_trashbin/versions/' . $versionedFile . '.v' . $v);
+						$rootView->rename($user . '/files_trashbin/versions/' . $versionedFile . '.v' . $v, $owner . '/files_versions/' . $ownerPath . '.v' . $v);
 					}
 				}
 			}
 
-            // enable proxy
-            \OC_FileProxy::$enabled = $proxyStatus;
+			// enable proxy
+			\OC_FileProxy::$enabled = $proxyStatus;
 		}
 		return $size;
 	}
 
-
-    /**
-     * @brief restore encryption keys from trash bin
-     *
-     * @param \OC\Files\View $view
-     * @param $file complete path to file
-     * @param $filename name of file
-     * @param $ext file extension in case a file with the same $filename already exists
-     * @param $location location of file
-     * @param $timestamp deleteion time
-     *
-     * @return size of restored encrypted file
-     */
-    private static function restoreEncryptionKeys($view, $file, $filename, $ext, $location, $timestamp) {
+	/**
+	 * @brief restore encryption keys from trash bin
+	 *
+	 * @param \OC\Files\View $view
+	 * @param $file complete path to file
+	 * @param $filename name of file
+	 * @param $ext file extension in case a file with the same $filename already exists
+	 * @param $location location of file
+	 * @param $timestamp deleteion time
+	 *
+	 * @return size of restored encrypted file
+	 */
+	private static function restoreEncryptionKeys($view, $file, $filename, $ext, $location, $timestamp) {
 		// Take care of encryption keys TODO! Get '.key' in file between file name and delete date (also for permanent delete!)
 		$size = 0;
 		if (\OCP\App::isEnabled('files_encryption')) {
 			$user = \OCP\User::getUser();
 			$rootView = new \OC\Files\View('/');
 
-			$target = \OC\Files\Filesystem::normalizePath('/'.$location.'/'.$filename.$ext);
+			$target = \OC\Files\Filesystem::normalizePath('/' . $location . '/' . $filename . $ext);
 
 			list($owner, $ownerPath) = self::getUidAndFilename($target);
 
-            $path_parts = pathinfo($file);
-            $source_location = $path_parts['dirname'];
-
-            if ($view->is_dir('/files_trashbin/keyfiles/'.$file)) {
-                if($source_location != '.') {
-                    $keyfile = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/keyfiles/' . $source_location . '/' . $filename);
-                    $sharekey = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/share-keys/' . $source_location . '/' . $filename);
-                } else {
-                    $keyfile = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/keyfiles/' . $filename);
-                    $sharekey = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/share-keys/' . $filename);
-                }
-            } else {
-                $keyfile = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/keyfiles/' . $source_location . '/' . $filename . '.key');
-            }
-
-            if ($timestamp) {
-                $keyfile .= '.d' . $timestamp;
-            }
-
-            // disable proxy to prevent recursive calls
-            $proxyStatus = \OC_FileProxy::$enabled;
-            \OC_FileProxy::$enabled = false;
-
-            if ($rootView->file_exists($keyfile)) {
-                // handle directory
-            	if ($rootView->is_dir($keyfile)) {
-
-                    // handle keyfiles
-                    $size += self::calculateSize(new \OC\Files\View($keyfile));
-            		$rootView->rename($keyfile, $owner.'/files_encryption/keyfiles/' . $ownerPath);
-
-                    // handle share-keys
-                    if ($timestamp) {
-                        $sharekey .= '.d' . $timestamp;
-                    }
-					$size += self::calculateSize(new \OC\Files\View($sharekey));
-                    $rootView->rename($sharekey, $owner.'/files_encryption/share-keys/' . $ownerPath);
+			$path_parts = pathinfo($file);
+			$source_location = $path_parts['dirname'];
+
+			if ($view->is_dir('/files_trashbin/keyfiles/' . $file)) {
+				if ($source_location != '.') {
+					$keyfile = \OC\Files\Filesystem::normalizePath($user . '/files_trashbin/keyfiles/' . $source_location . '/' . $filename);
+					$sharekey = \OC\Files\Filesystem::normalizePath($user . '/files_trashbin/share-keys/' . $source_location . '/' . $filename);
+				} else {
+					$keyfile = \OC\Files\Filesystem::normalizePath($user . '/files_trashbin/keyfiles/' . $filename);
+					$sharekey = \OC\Files\Filesystem::normalizePath($user . '/files_trashbin/share-keys/' . $filename);
+				}
+			} else {
+				$keyfile = \OC\Files\Filesystem::normalizePath($user . '/files_trashbin/keyfiles/' . $source_location . '/' . $filename . '.key');
+			}
+
+			if ($timestamp) {
+				$keyfile .= '.d' . $timestamp;
+			}
 
+			// disable proxy to prevent recursive calls
+			$proxyStatus = \OC_FileProxy::$enabled;
+			\OC_FileProxy::$enabled = false;
+
+			if ($rootView->file_exists($keyfile)) {
+				// handle directory
+				if ($rootView->is_dir($keyfile)) {
+
+					// handle keyfiles
+					$size += self::calculateSize(new \OC\Files\View($keyfile));
+					$rootView->rename($keyfile, $owner . '/files_encryption/keyfiles/' . $ownerPath);
+
+					// handle share-keys
+					if ($timestamp) {
+						$sharekey .= '.d' . $timestamp;
+					}
+					$size += self::calculateSize(new \OC\Files\View($sharekey));
+					$rootView->rename($sharekey, $owner . '/files_encryption/share-keys/' . $ownerPath);
 				} else {
-                    // handle keyfiles
+					// handle keyfiles
 					$size += $rootView->filesize($keyfile);
-            		$rootView->rename($keyfile, $owner.'/files_encryption/keyfiles/' . $ownerPath . '.key');
+					$rootView->rename($keyfile, $owner . '/files_encryption/keyfiles/' . $ownerPath . '.key');
 
-                    // handle share-keys
-                    $ownerShareKey = \OC\Files\Filesystem::normalizePath($user.'/files_trashbin/share-keys/' . $source_location . '/' . $filename . '.' . $user. '.shareKey');
-                    if ($timestamp) {
-                        $ownerShareKey .= '.d' . $timestamp;
-                    }
+					// handle share-keys
+					$ownerShareKey = \OC\Files\Filesystem::normalizePath($user . '/files_trashbin/share-keys/' . $source_location . '/' . $filename . '.' . $user . '.shareKey');
+					if ($timestamp) {
+						$ownerShareKey .= '.d' . $timestamp;
+					}
 
-                    $size += $rootView->filesize($ownerShareKey);
+					$size += $rootView->filesize($ownerShareKey);
 
-                    // move only owners key
-                    $rootView->rename($ownerShareKey, $owner.'/files_encryption/share-keys/' . $ownerPath . '.' . $user. '.shareKey');
+					// move only owners key
+					$rootView->rename($ownerShareKey, $owner . '/files_encryption/share-keys/' . $ownerPath . '.' . $user . '.shareKey');
 
-                    // try to re-share if file is shared
-                    $filesystemView = new \OC_FilesystemView('/');
-                    $session = new \OCA\Encryption\Session($filesystemView);
-                    $util = new \OCA\Encryption\Util($filesystemView, $user);
+					// try to re-share if file is shared
+					$filesystemView = new \OC_FilesystemView('/');
+					$session = new \OCA\Encryption\Session($filesystemView);
+					$util = new \OCA\Encryption\Util($filesystemView, $user);
 
-                    // fix the file size
-                    $absolutePath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files/'. $ownerPath);
-                    $util->fixFileSize($absolutePath);
+					// fix the file size
+					$absolutePath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files/' . $ownerPath);
+					$util->fixFileSize($absolutePath);
 
-                    // get current sharing state
-                    $sharingEnabled = \OCP\Share::isEnabled();
+					// get current sharing state
+					$sharingEnabled = \OCP\Share::isEnabled();
 
-                    // get the final filename
-                    $target = \OC\Files\Filesystem::normalizePath($location.'/'.$filename);
+					// get the final filename
+					$target = \OC\Files\Filesystem::normalizePath($location . '/' . $filename);
 
-                    // get users sharing this file
-                    $usersSharing = $util->getSharingUsersArray($sharingEnabled, $target.$ext, $user);
+					// get users sharing this file
+					$usersSharing = $util->getSharingUsersArray($sharingEnabled, $target . $ext, $user);
 
-                    // Attempt to set shareKey
-                    $util->setSharedFileKeyfiles($session, $usersSharing, $target.$ext);
+					// Attempt to set shareKey
+					$util->setSharedFileKeyfiles($session, $usersSharing, $target . $ext);
 				}
 			}
 
-            // enable proxy
-            \OC_FileProxy::$enabled = $proxyStatus;
+			// enable proxy
+			\OC_FileProxy::$enabled = $proxyStatus;
 		}
 		return $size;
 	}
 
 	/**
 	 * @brief delete file from trash bin permanently
-     *
+	 *
 	 * @param $filename path to the file
 	 * @param $timestamp of deletion time
-     *
+	 *
 	 * @return size of deleted files
 	 */
-	public static function delete($filename, $timestamp=null) {
+	public static function delete($filename, $timestamp = null) {
 		$user = \OCP\User::getUser();
-		$view = new \OC\Files\View('/'.$user);
+		$view = new \OC\Files\View('/' . $user);
 		$size = 0;
-	
+
 		$trashbinSize = self::getTrashbinSize($user);
-		if ( $trashbinSize === false || $trashbinSize < 0 ) {
-			$trashbinSize = self::calculateSize(new \OC\Files\View('/'. $user.'/files_trashbin'));
+		if ($trashbinSize === false || $trashbinSize < 0) {
+			$trashbinSize = self::calculateSize(new \OC\Files\View('/' . $user . '/files_trashbin'));
 		}
 
-		if ( $timestamp ) {
+		if ($timestamp) {
 			$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=? AND `id`=? AND `timestamp`=?');
-			$query->execute(array($user,$filename,$timestamp));
-			$file = $filename.'.d'.$timestamp;
+			$query->execute(array($user, $filename, $timestamp));
+			$file = $filename . '.d' . $timestamp;
 		} else {
 			$file = $filename;
 		}
 
 		$size += self::deleteVersions($view, $file, $filename, $timestamp);
 		$size += self::deleteEncryptionKeys($view, $file, $filename, $timestamp);
-	
-		if ($view->is_dir('/files_trashbin/files/'.$file)) {
-			$size += self::calculateSize(new \OC\Files\View('/'.$user.'/files_trashbin/files/'.$file));
+
+		if ($view->is_dir('/files_trashbin/files/' . $file)) {
+			$size += self::calculateSize(new \OC\Files\View('/' . $user . '/files_trashbin/files/' . $file));
 		} else {
-			$size += $view->filesize('/files_trashbin/files/'.$file);
+			$size += $view->filesize('/files_trashbin/files/' . $file);
 		}
-		$view->unlink('/files_trashbin/files/'.$file);
+		$view->unlink('/files_trashbin/files/' . $file);
 		$trashbinSize -= $size;
 		self::setTrashbinSize($user, $trashbinSize);
-		
+
 		return $size;
 	}
 
 	private static function deleteVersions($view, $file, $filename, $timestamp) {
 		$size = 0;
-		if ( \OCP\App::isEnabled('files_versions') ) {
+		if (\OCP\App::isEnabled('files_versions')) {
 			$user = \OCP\User::getUser();
-			if ($view->is_dir('files_trashbin/versions/'.$file)) {
-				$size += self::calculateSize(new \OC\Files\view('/'.$user.'/files_trashbin/versions/'.$file));
-				$view->unlink('files_trashbin/versions/'.$file);
-			} else if ( $versions = self::getVersionsFromTrash($filename, $timestamp) ) {
+			if ($view->is_dir('files_trashbin/versions/' . $file)) {
+				$size += self::calculateSize(new \OC\Files\view('/' . $user . '/files_trashbin/versions/' . $file));
+				$view->unlink('files_trashbin/versions/' . $file);
+			} else if ($versions = self::getVersionsFromTrash($filename, $timestamp)) {
 				foreach ($versions as $v) {
-					if ($timestamp ) {
-						$size += $view->filesize('/files_trashbin/versions/'.$filename.'.v'.$v.'.d'.$timestamp);
-						$view->unlink('/files_trashbin/versions/'.$filename.'.v'.$v.'.d'.$timestamp);
+					if ($timestamp) {
+						$size += $view->filesize('/files_trashbin/versions/' . $filename . '.v' . $v . '.d' . $timestamp);
+						$view->unlink('/files_trashbin/versions/' . $filename . '.v' . $v . '.d' . $timestamp);
 					} else {
-						$size += $view->filesize('/files_trashbin/versions/'.$filename.'.v'.$v);
-						$view->unlink('/files_trashbin/versions/'.$filename.'.v'.$v);
+						$size += $view->filesize('/files_trashbin/versions/' . $filename . '.v' . $v);
+						$view->unlink('/files_trashbin/versions/' . $filename . '.v' . $v);
 					}
 				}
 			}
@@ -553,10 +555,10 @@ class Trashbin {
 
 			if ($view->is_dir('/files_trashbin/files/' . $file)) {
 				$keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $filename);
-				$sharekeys =  \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $filename);
+				$sharekeys = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $filename);
 			} else {
 				$keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $filename . '.key');
-				$sharekeys =  \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $filename . '.' . $user . '.shareKey');
+				$sharekeys = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $filename . '.' . $user . '.shareKey');
 			}
 			if ($timestamp) {
 				$keyfile .= '.d' . $timestamp;
@@ -583,17 +585,17 @@ class Trashbin {
 	 * @param $timestamp of deletion time
 	 * @return true if file exists, otherwise false
 	 */
-	public static function file_exists($filename, $timestamp=null) {
+	public static function file_exists($filename, $timestamp = null) {
 		$user = \OCP\User::getUser();
-		$view = new \OC\Files\View('/'.$user);
+		$view = new \OC\Files\View('/' . $user);
 
 		if ($timestamp) {
-			$filename = $filename.'.d'.$timestamp;
+			$filename = $filename . '.d' . $timestamp;
 		} else {
 			$filename = $filename;
 		}
 
-		$target = \OC\Files\Filesystem::normalizePath('files_trashbin/files/'.$filename);
+		$target = \OC\Files\Filesystem::normalizePath('files_trashbin/files/' . $filename);
 		return $view->file_exists($target);
 	}
 
@@ -623,11 +625,11 @@ class Trashbin {
 		$softQuota = true;
 		$user = \OCP\User::getUser();
 		$quota = \OC_Preferences::getValue($user, 'files', 'quota');
-		$view = new \OC\Files\View('/'.$user);
-		if ( $quota === null || $quota === 'default') {
+		$view = new \OC\Files\View('/' . $user);
+		if ($quota === null || $quota === 'default') {
 			$quota = \OC_Appconfig::getValue('files', 'default_quota');
 		}
-		if ( $quota === null || $quota === 'none' ) {
+		if ($quota === null || $quota === 'none') {
 			$quota = \OC\Files\Filesystem::free_space('/');
 			$softQuota = false;
 		} else {
@@ -638,11 +640,11 @@ class Trashbin {
 		// subtract size of files and current trash bin size from quota
 		if ($softQuota) {
 			$rootInfo = $view->getFileInfo('/files/');
-			$free = $quota-$rootInfo['size']; // remaining free space for user
-			if ( $free > 0 ) {
+			$free = $quota - $rootInfo['size']; // remaining free space for user
+			if ($free > 0) {
 				$availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $trashbinSize; // how much space can be used for versions
 			} else {
-				$availableSpace = $free-$trashbinSize;
+				$availableSpace = $free - $trashbinSize;
 			}
 		} else {
 			$availableSpace = $quota;
@@ -658,43 +660,40 @@ class Trashbin {
 	private static function expire($trashbinSize) {
 
 		$user = \OCP\User::getUser();
-		$view = new \OC\Files\View('/'.$user);
+		$view = new \OC\Files\View('/' . $user);
 		$availableSpace = self::calculateFreeSpace($trashbinSize);
 		$size = 0;
 
 		$query = \OC_DB::prepare('SELECT `location`,`type`,`id`,`timestamp` FROM `*PREFIX*files_trash` WHERE `user`=?');
 		$result = $query->execute(array($user))->fetchAll();
 
-		$retention_obligation = \OC_Config::getValue('trashbin_retention_obligation',
-			self::DEFAULT_RETENTION_OBLIGATION);
+		$retention_obligation = \OC_Config::getValue('trashbin_retention_obligation', self::DEFAULT_RETENTION_OBLIGATION);
 
 		$limit = time() - ($retention_obligation * 86400);
 
-		foreach ( $result as $r ) {
+		foreach ($result as $r) {
 			$timestamp = $r['timestamp'];
 			$filename = $r['id'];
-			if ( $r['timestamp'] < $limit ) {
+			if ($r['timestamp'] < $limit) {
 				$size += self::delete($filename, $timestamp);
-				\OC_Log::write('files_trashbin', 'remove "'.$filename.'" fom trash bin because it is older than '.$retention_obligation, \OC_log::INFO);
+				\OC_Log::write('files_trashbin', 'remove "' . $filename . '" fom trash bin because it is older than ' . $retention_obligation, \OC_log::INFO);
 			}
 		}
 		$availableSpace = $availableSpace + $size;
 		// if size limit for trash bin reached, delete oldest files in trash bin
 		if ($availableSpace < 0) {
 			$query = \OC_DB::prepare('SELECT `location`,`type`,`id`,`timestamp` FROM `*PREFIX*files_trash`'
-				.' WHERE `user`=? ORDER BY `timestamp` ASC');
+					. ' WHERE `user`=? ORDER BY `timestamp` ASC');
 			$result = $query->execute(array($user))->fetchAll();
 			$length = count($result);
 			$i = 0;
-			while ( $i < $length &&   $availableSpace < 0 ) {
+			while ($i < $length && $availableSpace < 0) {
 				$tmp = self::delete($result[$i]['id'], $result[$i]['timestamp']);
-				\OC_Log::write('files_trashbin', 'remove "'.$result[$i]['id'].'" ('.$tmp.'B) to meet the limit of trash bin size (50% of available quota)', \OC_log::INFO);
+				\OC_Log::write('files_trashbin', 'remove "' . $result[$i]['id'] . '" (' . $tmp . 'B) to meet the limit of trash bin size (50% of available quota)', \OC_log::INFO);
 				$availableSpace += $tmp;
 				$size += $tmp;
 				$i++;
 			}
-
-
 		}
 
 		return $size;
@@ -707,25 +706,25 @@ class Trashbin {
 	 * @param $destination destination path relative to the users root directoy
 	 * @param $view file view for the users root directory
 	 */
-	private static function copy_recursive( $source, $destination, $view ) {
+	private static function copy_recursive($source, $destination, $view) {
 		$size = 0;
-		if ( $view->is_dir( 'files'.$source ) ) {
-			$view->mkdir( $destination );
-			$view->touch($destination,  $view->filemtime('files'.$source));
-			foreach ( \OC_Files::getDirectoryContent($source) as $i ) {
-				$pathDir = $source.'/'.$i['name'];
-				if ( $view->is_dir('files'.$pathDir) ) {
-					$size += self::copy_recursive($pathDir, $destination.'/'.$i['name'], $view);
+		if ($view->is_dir('files' . $source)) {
+			$view->mkdir($destination);
+			$view->touch($destination, $view->filemtime('files' . $source));
+			foreach (\OC_Files::getDirectoryContent($source) as $i) {
+				$pathDir = $source . '/' . $i['name'];
+				if ($view->is_dir('files' . $pathDir)) {
+					$size += self::copy_recursive($pathDir, $destination . '/' . $i['name'], $view);
 				} else {
-					$size += $view->filesize('files'.$pathDir);
-					$view->copy( 'files'.$pathDir, $destination . '/' . $i['name'] );
-					$view->touch($destination . '/' . $i['name'], $view->filemtime('files'.$pathDir));
+					$size += $view->filesize('files' . $pathDir);
+					$view->copy('files' . $pathDir, $destination . '/' . $i['name']);
+					$view->touch($destination . '/' . $i['name'], $view->filemtime('files' . $pathDir));
 				}
 			}
 		} else {
-			$size += $view->filesize('files'.$source);
-			$view->copy( 'files'.$source, $destination );
-			$view->touch($destination, $view->filemtime('files'.$source));
+			$size += $view->filesize('files' . $source);
+			$view->copy('files' . $source, $destination);
+			$view->touch($destination, $view->filemtime('files' . $source));
 		}
 		return $size;
 	}
@@ -736,24 +735,25 @@ class Trashbin {
 	 * @param $timestamp timestamp when the file was deleted
 	 */
 	private static function getVersionsFromTrash($filename, $timestamp) {
-		$view = new \OC\Files\View('/'.\OCP\User::getUser().'/files_trashbin/versions');
-		$versionsName = $view->getLocalFile($filename);
+		$view = new \OC\Files\View('/' . \OCP\User::getUser() . '/files_trashbin/versions');
+		$versionsName = $view->getLocalFile($filename) . '.v';
+		$escapedVersionsName = preg_replace('/(\*|\?|\[)/', '[$1]', $versionsName);
 		$versions = array();
-		if ($timestamp ) {
+		if ($timestamp) {
 			// fetch for old versions
-			$matches = glob( $versionsName.'.v*.d'.$timestamp );
-			$offset = -strlen($timestamp)-2;
+			$matches = glob($escapedVersionsName . '*.d' . $timestamp);
+			$offset = -strlen($timestamp) - 2;
 		} else {
-			$matches = glob( $versionsName.'.v*' );
+			$matches = glob($escapedVersionsName . '*');
 		}
 
-		foreach( $matches as $ma ) {
-			if ( $timestamp ) {
-				$parts = explode( '.v', substr($ma, 0, $offset) );
-				$versions[] = ( end( $parts ) );
+		foreach ($matches as $ma) {
+			if ($timestamp) {
+				$parts = explode('.v', substr($ma, 0, $offset));
+				$versions[] = ( end($parts) );
 			} else {
-				$parts = explode( '.v', $ma );
-				$versions[] = ( end( $parts ) );
+				$parts = explode('.v', $ma);
+				$versions[] = ( end($parts) );
 			}
 		}
 		return $versions;
@@ -768,12 +768,12 @@ class Trashbin {
 	 */
 	private static function getUniqueExtension($location, $filename, $view) {
 		$ext = '';
-		if ( $view->file_exists('files'.$location.'/'.$filename) ) {
+		if ($view->file_exists('files' . $location . '/' . $filename)) {
 			$tmpext = '.restored';
 			$ext = $tmpext;
 			$i = 1;
-			while ( $view->file_exists('files'.$location.'/'.$filename.$ext) ) {
-				$ext = $tmpext.$i;
+			while ($view->file_exists('files' . $location . '/' . $filename . $ext)) {
+				$ext = $tmpext . $i;
 				$i++;
 			}
 		}
@@ -786,17 +786,16 @@ class Trashbin {
 	 * @return size of the folder
 	 */
 	private static function calculateSize($view) {
-		$root = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath('');
+		$root = \OCP\Config::getSystemValue('datadirectory') . $view->getAbsolutePath('');
 		if (!file_exists($root)) {
 			return 0;
 		}
-		$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($root),
-			\RecursiveIteratorIterator::CHILD_FIRST);
+		$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($root), \RecursiveIteratorIterator::CHILD_FIRST);
 		$size = 0;
 
 		foreach ($iterator as $path) {
-			$relpath = substr($path, strlen($root)-1);
-			if ( !$view->is_dir($relpath) ) {
+			$relpath = substr($path, strlen($root) - 1);
+			if (!$view->is_dir($relpath)) {
 				$size += $view->filesize($relpath);
 			}
 		}
@@ -818,7 +817,7 @@ class Trashbin {
 		}
 		return false;
 	}
-	
+
 	/**
 	 * write to the database how much space is in use for the trash bin
 	 *
@@ -826,9 +825,9 @@ class Trashbin {
 	 * @param $size size of the trash bin
 	 */
 	private static function setTrashbinSize($user, $size) {
-		if ( self::getTrashbinSize($user) === false) {
+		if (self::getTrashbinSize($user) === false) {
 			$query = \OC_DB::prepare('INSERT INTO `*PREFIX*files_trashsize` (`size`, `user`) VALUES (?, ?)');
-		}else {
+		} else {
 			$query = \OC_DB::prepare('UPDATE `*PREFIX*files_trashsize` SET `size`=? WHERE `user`=?');
 		}
 		$query->execute(array($size, $user));
@@ -843,4 +842,5 @@ class Trashbin {
 		//Listen to delete user signal
 		\OCP\Util::connectHook('OC_User', 'pre_deleteUser', "OCA\Files_Trashbin\Hooks", "deleteUser_hook");
 	}
+
 }
diff --git a/apps/files_versions/l10n/he.php b/apps/files_versions/l10n/he.php
index ad2e261d5391028d34b81bc2c2beca95e83e0f74..577389eb0817ddbf0a3df890e91126142f68dc12 100644
--- a/apps/files_versions/l10n/he.php
+++ b/apps/files_versions/l10n/he.php
@@ -1,3 +1,11 @@
 <?php $TRANSLATIONS = array(
-"Versions" => "גרסאות"
+"Could not revert: %s" => "לא ניתן להחזיר: %s",
+"success" => "הושלם",
+"File %s was reverted to version %s" => "הקובץ %s הוחזר לגרסה %s",
+"failure" => "נכשל",
+"File %s could not be reverted to version %s" => "לא ניתן להחזיר את הקובץ %s לגרסה %s",
+"No old versions available" => "אין גרסאות ישנות זמינות",
+"No path specified" => "לא צוין נתיב",
+"Versions" => "גרסאות",
+"Revert a file to a previous version by clicking on its revert button" => "ניתן להחזיר קובץ לגרסה קודמת על ידי לחיצה על לחצן ההחזרה שלו"
 );
diff --git a/apps/files_versions/l10n/ko.php b/apps/files_versions/l10n/ko.php
index 994144f39e1830aa47b4b00c7b5851fb39f7d53d..df34e4681b421549ec75181338cbcacd2e69bbe1 100644
--- a/apps/files_versions/l10n/ko.php
+++ b/apps/files_versions/l10n/ko.php
@@ -1,11 +1,11 @@
 <?php $TRANSLATIONS = array(
 "Could not revert: %s" => "되돌릴 수 없습니다: %s",
-"success" => "완료",
-"File %s was reverted to version %s" => "파일 %s를 버전 %s로 변경하였습니다.",
+"success" => "성공",
+"File %s was reverted to version %s" => "파일 %s을(를) 버전 %s(으)로 되돌림",
 "failure" => "실패",
-"File %s could not be reverted to version %s" => "파일 %s를 버전 %s로 되돌리지 못했습니다.",
-"No old versions available" => "오래된 버전을 사용할 수 없습니다",
-"No path specified" => "경로를 알수 없습니다.",
-"Versions" => "버젼",
-"Revert a file to a previous version by clicking on its revert button" => "변경 버튼을 클릭하여 이전 버전의 파일로 변경할 수 있습니다."
+"File %s could not be reverted to version %s" => "파일 %s을(를) 버전 %s(으)로 되돌리지 못했음",
+"No old versions available" => "오래된 버전을 사용할 수 없음",
+"No path specified" => "경로가 지정되지 않았음",
+"Versions" => "버전",
+"Revert a file to a previous version by clicking on its revert button" => "변경 단추를 눌러 이전 버전의 파일로 되돌릴 수 있습니다"
 );
diff --git a/apps/files_versions/l10n/sv.php b/apps/files_versions/l10n/sv.php
index bcd21bc599ce1eb1eb0f9857626be6c8ae4be513..83170976309cf99cd964a8dcabcb04a7a2ae9b6a 100644
--- a/apps/files_versions/l10n/sv.php
+++ b/apps/files_versions/l10n/sv.php
@@ -7,5 +7,5 @@
 "No old versions available" => "Inga gamla versioner finns tillgängliga",
 "No path specified" => "Ingen sökväg angiven",
 "Versions" => "Versioner",
-"Revert a file to a previous version by clicking on its revert button" => "Återställ en fil till en tidigare version genom att klicka på knappen"
+"Revert a file to a previous version by clicking on its revert button" => "Återställ en fil till en tidigare version genom att klicka på återställningsknappen"
 );
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 4beb9e0fe5cc18929f4255871836c3de4d009ab8..2f8262475b44e6f774b88863df60168c2600c390 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -241,11 +241,12 @@ class Storage {
 	public static function getVersions($uid, $filename, $count = 0 ) {
 		if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
 			$versions_fileview = new \OC\Files\View('/' . $uid . '/files_versions');
-			$versionsName = $versions_fileview->getLocalFile($filename);
-			
+			$versionsName = $versions_fileview->getLocalFile($filename).'.v';
+			$escapedVersionName = preg_replace('/(\*|\?|\[)/', '[$1]', $versionsName);
+
 			$versions = array();
 			// fetch for old versions
-			$matches = glob(preg_quote($versionsName).'.v*' );
+			$matches = glob($escapedVersionName.'*');
 
 			if ( !$matches ) {
 				return $versions;
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index dd7373eb690a66b6d8dbb7bf81712c187b50007e..65c7c76b5d7811438a8b3b4292c8896def208941 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Selhalo zrušení mapování.",
 "Failed to delete the server configuration" => "Selhalo smazání nastavení serveru",
 "The configuration is valid and the connection could be established!" => "Nastavení je v pořádku a spojení bylo navázáno.",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurace je v pořádku, ale spojení selhalo. Zkontrolujte, prosím, nastavení serveru a přihlašovací údaje.",
@@ -7,6 +8,7 @@
 "Take over settings from recent server configuration?" => "Převzít nastavení z nedávného nastavení serveru?",
 "Keep settings?" => "Ponechat nastavení?",
 "Cannot add server configuration" => "Nelze přidat nastavení serveru",
+"mappings cleared" => "mapování zrušeno",
 "Success" => "Úspěch",
 "Error" => "Chyba",
 "Connection test succeeded" => "Test spojení byl úspěšný",
@@ -72,6 +74,13 @@
 "Email Field" => "Pole e-mailu",
 "User Home Folder Naming Rule" => "Pravidlo pojmenování domovské složky uživatele",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte LDAP/AD parametr.",
+"Internal Username" => "Interní uživatelské jméno",
+"Internal Username Attribute:" => "Atribut interního uživatelského jména:",
+"Override UUID detection" => "Nastavit ručně UUID atribut",
+"UUID Attribute:" => "Atribut UUID:",
+"Username-LDAP User Mapping" => "Mapování uživatelských jmen z LDAPu",
+"Clear Username-LDAP User Mapping" => "Zrušit mapování uživatelských jmen LDAPu",
+"Clear Groupname-LDAP Group Mapping" => "Zrušit mapování názvů skupin LDAPu",
 "Test Configuration" => "Vyzkoušet nastavení",
 "Help" => "Nápověda"
 );
diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php
index 98fb32b1d26e902e19b819bf0e4c2aa506ec2fdd..6925ea89a0cafbd02a2a7acdc2af438cfff7f799 100644
--- a/apps/user_ldap/l10n/es_AR.php
+++ b/apps/user_ldap/l10n/es_AR.php
@@ -1,12 +1,14 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Hubo un error al borrar las asignaciones.",
 "Failed to delete the server configuration" => "Fallo al borrar la configuración del servidor",
-"The configuration is valid and the connection could be established!" => "La configuración es 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",
 "Take over settings from recent server configuration?" => "Tomar los valores de la anterior configuración de servidor?",
 "Keep settings?" => "¿Mantener preferencias?",
 "Cannot add server configuration" => "No se pudo añadir la configuración del servidor",
+"mappings cleared" => "Asignaciones borradas",
 "Success" => "Éxito",
 "Error" => "Error",
 "Connection test succeeded" => "El este de conexión ha sido completado satisfactoriamente",
@@ -72,6 +74,16 @@
 "Email Field" => "Campo de e-mail",
 "User Home Folder Naming Rule" => "Regla de nombre de los directorios de usuario",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD.",
+"Internal Username" => "Nombre interno de usuario",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "Por defecto, el nombre interno de usuario va a ser creado a partir del atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. Para el nombre de usuario interno sólo se pueden usar estos caracteres: [a-zA-Z0-9_.@-]. Otros caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. Si ocurrieran colisiones, un número será añadido o incrementado. El nombre interno de usuario se usa para identificar un usuario internamente. Es también el nombre por defecto para el directorio personal del usuario in ownCloud. También es un puerto de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento por defecto puede ser cambiado. Para conseguir un comportamiento similar al anterior a ownCloud 5, ingresá el atributo del nombre en pantalla del usuario en el siguiente campo. Dejalo vacío para el comportamiento por defecto. Los cambios solo tendrán efecto para los nuevos usuarios LDAP.",
+"Internal Username Attribute:" => "Atributo Nombre Interno de usuario:",
+"Override UUID detection" => "Sobrescribir la detección UUID",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Por defecto, ownCloud detecta automáticamente el atributo UUID. El atributo UUID se usa para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno va a ser creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Podés sobrescribir la configuración y pasar un atributo de tu elección. Tenés que asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Dejalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto sólo en los nuevos usuarios y grupos de LDAP.",
+"UUID Attribute:" => "Atributo UUID:",
+"Username-LDAP User Mapping" => "Asignación del Nombre de usuario de un usuario LDAP",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud usa nombres de usuario para almacenar y asignar (meta) datos. Con el fin de identificar con precisión y reconocer usuarios, cada usuario LDAP tendrá un nombre de usuario interno. Esto requiere una asignación de nombre de usuario de ownCloud a usuario LDAP. El nombre de usuario creado se asigna al UUID del usuario LDAP. Además el DN se almacena en caché principalmente para reducir la interacción de LDAP, pero no se utiliza para la identificación. Si la DN cambia, los cambios serán encontrados por ownCloud. El nombre interno de ownCloud se utiliza para todo en ownCloud. Borrar las asignaciones dejará restos en distintos lugares. Borrar las asignaciones no depende de la configuración, ¡afecta a todas las configuraciones de LDAP! No borrar nunca las asignaciones en un entorno de producción. Sólo borrar asignaciones en una situación de prueba o experimental.",
+"Clear Username-LDAP User Mapping" => "Borrar la asignación de los Nombres de usuario de los usuarios LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Borrar la asignación de los Nombres de grupo de los grupos de LDAP",
 "Test Configuration" => "Probar configuración",
 "Help" => "Ayuda"
 );
diff --git a/apps/user_ldap/l10n/is.php b/apps/user_ldap/l10n/is.php
index dadac9eedaafec867fc819fadf930a242865807a..6ea474f56df6dd8b6a077eff7eb466d82ec90e4b 100644
--- a/apps/user_ldap/l10n/is.php
+++ b/apps/user_ldap/l10n/is.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
+"Keep settings?" => "Geyma stillingar ?",
 "Error" => "Villa",
 "Host" => "Netþjónn",
 "Password" => "Lykilorð",
+"Test Configuration" => "Prúfa uppsetningu",
 "Help" => "Hjálp"
 );
diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php
index 7edfe0919eba1978e6827feb2f2021ca569de7e5..5495ab994042601e6afab97101927c4aba4e5927 100644
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@@ -75,6 +75,7 @@
 "User Home Folder Naming Rule" => "Reguły nazewnictwa folderu domowego użytkownika",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Pozostaw puste dla user name (domyślnie). W przeciwnym razie podaj atrybut LDAP/AD.",
 "Internal Username" => "Wewnętrzna nazwa użytkownika",
+"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." => "Domyślnie, wewnętrzna nazwa użytkownika zostanie utworzona z atrybutu UUID, ang. Universally unique identifier - Unikalny identyfikator użytkownika. To daje pewność, że nazwa użytkownika jest niepowtarzalna a znaki nie muszą być konwertowane. Wewnętrzna nazwa użytkownika dopuszcza jedynie znaki: [ a-zA-Z0-9_.@- ]. Pozostałe znaki zamieniane są na ich odpowiedniki ASCII lub po prostu pomijane. W przypadku, gdy nazwa się powtarza na końcu dodawana / zwiększana jest cyfra. Wewnętrzna nazwa użytkownika służy do wewnętrznej identyfikacji użytkownika. Jest to również domyślna nazwa głównego folderu w ownCloud. Jest to również klucz zdalnego URL, na przykład dla wszystkich usług *DAV. Dzięki temu ustawieniu można modyfikować domyślne zachowania. Aby osiągnąć podobny efekt jak w ownCloud 5 wpisz atrybut nazwy użytkownika w poniższym polu. Pozostaw puste dla domyślnego zachowania. Zmiany będą miały wpływ tylko na nowo stworzonych (dodane) użytkowników LDAP.",
 "Internal Username Attribute:" => "Wewnętrzny atrybut nazwy uzżytkownika:",
 "Override UUID detection" => "ZastÄ…p wykrywanie UUID",
 "UUID Attribute:" => "Atrybuty UUID:",
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index ed1e0f376db9b1daae01a2b2267b09aa278b6ee6..308fd34760aaee037f4a5890a7efaac920f2e771 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_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index eed6d373b9f0cad67262378cfb8ddada1e1cf2f5..d88b20dc46912ff228c30c8485211d3e2974f90e 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Не удалось очистить соотвествия.",
 "Failed to delete the server configuration" => "Не удалось удалить конфигурацию сервера",
 "The configuration is valid and the connection could be established!" => "Конфигурация правильная и подключение может быть установлено!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Конфигурация верна, но операция подключения завершилась неудачно. Пожалуйста, проверьте настройки сервера и учетные данные.",
@@ -7,6 +8,7 @@
 "Take over settings from recent server configuration?" => "Принять настройки из последней конфигурации сервера?",
 "Keep settings?" => "Сохранить настройки?",
 "Cannot add server configuration" => "Не получилось добавить конфигурацию сервера",
+"mappings cleared" => "Соответствия очищены",
 "Success" => "Успешно",
 "Error" => "Ошибка",
 "Connection test succeeded" => "Проверка соединения удалась",
@@ -72,6 +74,16 @@
 "Email Field" => "Поле адресса эллектронной почты",
 "User Home Folder Naming Rule" => "Правило именования Домашней Папки Пользователя",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Оставьте имя пользователя пустым (по умолчанию). Иначе укажите атрибут LDAP/AD.",
+"Internal Username" => "Внутреннее имя пользователя",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "По-умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Это необходимо для того, чтобы имя пользователя было уникальным и не содержало в себе запрещенных символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы замещаются соответствиями из таблицы ASCII или же просто пропускаются. При совпадении к имени будет добавлено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по-умолчанию для папки пользователя в ownCloud. Оно также портом для удаленных ссылок, к примеру, для всех сервисов *DAV. С помощию данной настройки можно изменить поведение по-умолчанию. Чтобы достичь поведения, как было настроено до изменения, ownCloud 5 выводит атрибут имени пользователя в этом поле. Оставьте его пустым для режима по-умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP.",
+"Internal Username Attribute:" => "Аттрибут для внутреннего имени:",
+"Override UUID detection" => "Переопределить нахождение UUID",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "По-умолчанию, ownCloud определяет атрибут UUID автоматически. Этот атрибут используется для того, чтобы достоверно индентифицировать пользователей и группы LDAP. Также, на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по-умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP.",
+"UUID Attribute:" => "Аттрибут для UUID:",
+"Username-LDAP User Mapping" => "Соответствия Имя-Пользователь LDAP",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud использует имена пользователей для хранения и назначения метаданных. Для точной идентификации и распознавания пользователей, каждый пользователь LDAP будет иметь свое внутреннее имя пользователя. Это требует наличия соответствия имени пользователя ownCloud к пользователю LDAP. При создании имя пользователя назначается идентификатору UUID пользователя LDAP. Помимо этого кэшируется доменное имя (DN) для снижения взаимодействия LDAP, однако оно не используется для идентификации. Если доменное имя было изменено, об этом станет известно ownCloud. Внутреннее имя ownCloud используется повсеместно в ownCloud. При очистке соответствий повсюду будут оставаться \"хвосты\". Очистка соответствий не привязана к конкретной конфигурации, она влияет на все конфигурации LDAP! Никогда не очищайте соответствия в рабочем окружении. Очищайте соответствия только во время тестов или в экспериментальных конфигурациях.",
+"Clear Username-LDAP User Mapping" => "Очистить соответствия Имя-Пользователь LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Очистить соответствия Группа-Группа LDAP",
 "Test Configuration" => "Тестовая конфигурация",
 "Help" => "Помощь"
 );
diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
index e36a1589367219db8f8038a1fd50dbf786dceae1..fe1e14ea6fd80de1eb33be91a4992d7aa5e608d5 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -79,6 +79,9 @@
 "Internal Username Attribute:" => "Atribút interného používateľského mena:",
 "Override UUID detection" => "Prepísať UUID detekciu",
 "UUID Attribute:" => "UUID atribút:",
+"Username-LDAP User Mapping" => "Mapovanie názvov LDAP používateľských mien",
+"Clear Username-LDAP User Mapping" => "Zrušiť mapovanie LDAP používateľských mien",
+"Clear Groupname-LDAP Group Mapping" => "Zrušiť mapovanie názvov LDAP skupín",
 "Test Configuration" => "Test nastavenia",
 "Help" => "Pomoc"
 );
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index eb30bd22f019b24fc08023cf062748f644aa44be..6ab8a9e5a6eaedfc5d0a6b37133cd5b76eebdbaa 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Fel vid rensning av mappningar",
 "Failed to delete the server configuration" => "Misslyckades med att radera serverinställningen",
 "The configuration is valid and the connection could be established!" => "Inställningen är giltig och anslutningen kunde upprättas!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurationen är riktig, men Bind felade. Var vänlig och kontrollera serverinställningar och logininformation.",
@@ -7,6 +8,7 @@
 "Take over settings from recent server configuration?" => "Ta över inställningar från tidigare serverkonfiguration?",
 "Keep settings?" => "Behåll inställningarna?",
 "Cannot add server configuration" => "Kunde inte lägga till serverinställning",
+"mappings cleared" => "mappningar rensade",
 "Success" => "Lyckat",
 "Error" => "Fel",
 "Connection test succeeded" => "Anslutningstestet lyckades",
@@ -72,6 +74,16 @@
 "Email Field" => "E-postfält",
 "User Home Folder Naming Rule" => "Namnregel för hemkatalog",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lämnas tomt för användarnamn (standard). Ange annars ett LDAP/AD-attribut.",
+"Internal Username" => "Internt Användarnamn",
+"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." => "Som standard skapas det interna användarnamnet från UUID-attributet. Det säkerställer att användarnamnet är unikt och tecken inte behöver konverteras. Det interna användarnamnet har restriktionerna att endast följande tecken är tillåtna:  [ a-zA-Z0-9_.@- ]. Andra tecken blir ersatta av deras motsvarighet i ASCII eller utelämnas helt. En siffra kommer att läggas till eller ökas på vid en kollision. Det interna användarnamnet används för att identifiera användaren internt. Det är även förvalt som användarens användarnamn i ownCloud. Det är även en port för fjärråtkomst, t.ex. för alla *DAV-tjänster. Med denna inställning kan det förvalda beteendet åsidosättas. För att uppnå ett liknande beteende som innan ownCloud 5, ange attributet för användarens visningsnamn i detta fält. Lämna det tomt för förvalt beteende. Ändringarna kommer endast att påverka nyligen mappade (tillagda) LDAP-användare",
+"Internal Username Attribute:" => "Internt Användarnamn Attribut:",
+"Override UUID detection" => "Åsidosätt UUID detektion",
+"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." => "Som standard upptäcker ownCloud automatiskt UUID-attributet. Det UUID-attributet används för att utan tvivel identifiera LDAP-användare och grupper. Dessutom kommer interna användarnamn skapas baserat på detta UUID, om inte annat anges ovan. Du kan åsidosätta inställningen och passera ett attribut som du själv väljer. Du måste se till att attributet som du väljer kan hämtas för både användare och grupper och att det är unikt. Lämna det tomt för standard beteende. Förändringar kommer endast att påverka nyligen mappade (tillagda) LDAP-användare och grupper.",
+"UUID Attribute:" => "UUID Attribut:",
+"Username-LDAP User Mapping" => "Användarnamn-LDAP User Mapping",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud använder sig av användarnamn för att lagra och tilldela (meta) data. För att exakt kunna identifiera och känna igen användare, kommer varje LDAP-användare ha ett internt användarnamn. Detta kräver en mappning från ownCloud-användarnamn till LDAP-användare. Det skapade användarnamnet mappas till UUID för LDAP-användaren. Dessutom cachas DN  samt minska LDAP-interaktionen, men den används inte för identifiering. Om DN förändras, kommer förändringarna hittas av ownCloud. Det interna ownCloud-namnet används överallt i ownCloud. Om du rensar/raderar mappningarna kommer att lämna referenser överallt i systemet. Men den är inte konfigurationskänslig, den påverkar alla LDAP-konfigurationer! Rensa/radera aldrig mappningarna i en produktionsmiljö. Utan gör detta endast på i testmiljö!",
+"Clear Username-LDAP User Mapping" => "Rensa Användarnamn-LDAP User Mapping",
+"Clear Groupname-LDAP Group Mapping" => "Rensa Gruppnamn-LDAP Group Mapping",
 "Test Configuration" => "Testa konfigurationen",
 "Help" => "Hjälp"
 );
diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php
index 7b8389227aec8bf927826bc2b722d104c97c3c2f..675fe4dfc7529df218d7fcfeef4dd821b5eba24b 100644
--- a/apps/user_ldap/l10n/zh_CN.php
+++ b/apps/user_ldap/l10n/zh_CN.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Failed to clear the mappings." => "清除映射失败。",
 "Failed to delete the server configuration" => "未能删除服务器配置",
 "The configuration is valid and the connection could be established!" => "配置有效，能够建立连接！",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "配置有效但绑定失败。请检查服务器设置和认证信息。",
@@ -7,6 +8,7 @@
 "Take over settings from recent server configuration?" => "从近期的服务器配置中导入设置？",
 "Keep settings?" => "保留设置吗？",
 "Cannot add server configuration" => "无法添加服务器配置",
+"mappings cleared" => "清除映射",
 "Success" => "成功",
 "Error" => "错误",
 "Connection test succeeded" => "连接测试成功",
@@ -72,6 +74,16 @@
 "Email Field" => "电邮字段",
 "User Home Folder Naming Rule" => "用户主目录命名规则",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "将用户名称留空(默认)。否则指定一个LDAP/AD属性",
+"Internal Username" => "内部用户名",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder in ownCloud. It is also a port of remote URLs, for instance for all *DAV services. With this setting, the default behaviour can be overriden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users." => "默认情况下内部用户名具有唯一识别属性来确保用户名的唯一性和属性不用转换。内部用户名有严格的字符限制，只允许使用 [ a-zA-Z0-9_.@- ]。其他字符会被ASCII码取代或者被活力。当冲突时会增加或者减少一个数字。内部用户名被用于内部识别用户，同时也作为ownCloud中用户根文件夹的默认名。也作为远程URLs的一部分，比如为了所有的*DAV服务。在这种设置下，默认行为可以被超越。实现一个类似的行为，owncloud 5输入用户的显示名称属性在以下领域之前。让它空着的默认行为。更改只对新映射的影响（增加）的LDAP用户。",
+"Internal Username Attribute:" => "内部用户名属性：",
+"Override UUID detection" => "超越UUID检测",
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups." => "默认ownCloud自动检测UUID属性。UUID属性用来无误的识别LDAP用户和组。同时内部用户名也基于UUID创建，如果没有上述的指定。也可以超越设置直接指定一种属性。但一定要确保指定的属性取得的用户和组是唯一的。默认行为空。变更基于新映射(增加)LDAP用户和组才会生效。",
+"UUID Attribute:" => "UUID属性：",
+"Username-LDAP User Mapping" => "用户名-LDAP用户映射",
+"ownCloud uses usernames to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from ownCloud username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found by ownCloud. The internal ownCloud name is used all over in ownCloud. Clearing the Mappings will have leftovers everywhere. Clearing the Mappings is not configuration sensitive, it affects all LDAP configurations! Do never clear the mappings in a production environment. Only clear mappings in a testing or experimental stage." => "ownCloud使用用户名存储和分配数据(元)。为了准确地识别和确认用户，每个用户都有一个内部用户名。需要从ownCloud用户名映射到LDAP用户。创建的用户名映射到LDAP用户的UUID。此外，DN是缓存以及减少LDAP交互，但它不用于识别。如果DN变化，ownCloud也会变化。内部ownCloud名在ownCloud的各处使用。清除映射将一片混乱。清除映射不是常用的配置，它影响到所有LDAP配置！千万不要在正式环境中清除映射。只有在测试或试验阶段可以清除映射。",
+"Clear Username-LDAP User Mapping" => "清除用户-LDAP用户映射",
+"Clear Groupname-LDAP Group Mapping" => "清除组用户-LDAP级映射",
 "Test Configuration" => "测试配置",
 "Help" => "帮助"
 );
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 409f3758792ebe147642d0528e9429774b75aa07..31150a5bec57d2c9575e4f3e7af68d82213a6f24 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -621,6 +621,10 @@ class Connection {
 		if(empty($host)) {
 			return false;
 		}
+		if(strpos($host, '://') !== false) {
+			//ldap_connect ignores port paramater when URLs are passed
+			$host .= ':' . $port;
+		}
 		$this->ldapConnectionRes = ldap_connect($host, $port);
 		if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_PROTOCOL_VERSION, 3)) {
 			if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_REFERRALS, 0)) {
diff --git a/apps/user_webdavauth/l10n/ar.php b/apps/user_webdavauth/l10n/ar.php
index c17302f7bb105c8faacc41f5b0df751137f15e5b..78b347e51faf1f058f4ed6378cf3da48417e801a 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 a3bd703b258e9e8e0dcbe315f738b6fdd3289a7d..61503db8392acee4f71a4ace9351d29fab2182fc 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 7ac540f21303d7a122d9358f843f46ed651f8b98..339e4dbe68821e3bd8d531266ef89860980dae76 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 9bd4c96a2bb4fd1bc9d4d2c104e639e4de8d9b8d..e1f8d76e166777e522c0a694c5ca383069a3f7da 100644
--- a/apps/user_webdavauth/l10n/cs_CZ.php
+++ b/apps/user_webdavauth/l10n/cs_CZ.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Ověření 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 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 b268d3e15d075fdf749c73e9ae877ef8c4cca48e..0d1190ba22287047a6b4b0d819a8619017be6d84 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 c86ff44e55cb398bb682fc943b011f42bcb82fee..e2db395b1c6cf341d08f07b6632461a52817ae23 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 1aecfd29968080c9bb48525d360dadce0610adaf..21a886343f049303a4de5c7eb41cb878f8085b9e 100644
--- a/apps/user_webdavauth/l10n/de_DE.php
+++ b/apps/user_webdavauth/l10n/de_DE.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV-Authentifizierung",
-"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 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 951709c4d6490dad92fd4d7e39c2ab3471722129..79bb1d13bf7a20958ad7a3de8dfbefe93913bf03 100644
--- a/apps/user_webdavauth/l10n/el.php
+++ b/apps/user_webdavauth/l10n/el.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. Αυτό το plugin ελέγχει την απάντηση και την μετατρέπει σε HTTP κωδικό κατάστασης 401 και 403 για μη έγκυρα, όλες οι υπόλοιπες απαντήσεις είναι έγκυρες."
 );
diff --git a/apps/user_webdavauth/l10n/eo.php b/apps/user_webdavauth/l10n/eo.php
index d945f181e6bf65916c5c02254c89beb858a63020..0e1fda7c4c272e159143482372258230b9631272 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 103c3738e2d81d476fded156cf818c12ed97b23b..18c87794d65ffa659eb8d9623ab69d51161e077a 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 103c3738e2d81d476fded156cf818c12ed97b23b..cda5d7eab0562e65128a84276865804d5afc676c 100644
--- a/apps/user_webdavauth/l10n/es_AR.php
+++ b/apps/user_webdavauth/l10n/es_AR.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/et_EE.php b/apps/user_webdavauth/l10n/et_EE.php
index a3b86224ac2f53bc105db5b3755d59d382963b7b..470cb2b0f103e7cbe22757dae48e5fcb47abd66e 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 d792c1588bbe44d7710f894c79361d610b530e24..6395d7fc1e0de132b2ecd8e7182bc7477241dab4 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 6c67c78c8127238b3620faf4320ea366bab43d8b..61a848bcfe4bdf63f55c19d8951bf12834d5e369 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 9d528a3a9d216efbc2a776cf018a4b2af7d4cc86..e7fad26287c334861a12784eb10c7906ee59ef55 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 f63a7cb0ce85d357f1fd909b03547bf983f6de45..35ed8a1969fe4da0985458c75716f6fbbb951f5a 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
new file mode 100644
index 0000000000000000000000000000000000000000..aee7b00f1851a1955ad982c729de32375a26151f
--- /dev/null
+++ b/apps/user_webdavauth/l10n/he.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "הזדהות מול WebDAV",
+"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 643528011425d7d96c27f4159d2929e66ac27fa7..d7de5e57f3bd374e24a55450486357dfd7b50b07 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 4324ee8ff52df2f352930063a7560359e1bea44b..8ddf54e47350264df35acc69f5559231eb46daef 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 8fe0d974b321e9342567b22b0788d794bccbbb5c..10dcfa6e3d367eed2a6ef6dd7891403530a01ca0 100644
--- a/apps/user_webdavauth/l10n/is.php
+++ b/apps/user_webdavauth/l10n/is.php
@@ -1,3 +1,3 @@
 <?php $TRANSLATIONS = array(
-"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 a7cd6e8e4b4237d82768491444c7c7de59364008..1c1e0899b1da542eafe3a19f079d08204e651bbc 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 1cd14a03c727fe6292163c2f6e7b8ace978c596e..703cc71489e8f261ab8e0e58e40e81e3d911e50f 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 f475ea0b7374bf089369eeff0dd9ba2d5d06317c..34c502cc5ebe086b0f1c4d1bd8c011b0ccb51058 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 578ff35e721158986ca0d18b8a29378e55a6da02..e0431164a53469ed42e5e20b9d6503c0c4422048 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 8d0492ae487beb61ff302fdb5590a8d3ea6b5a1b..ed81efdf8bfdb0ab9f92f78afd729f04f27ce6fe 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 d0043df9f07292e01c3a5731ae71cd8b19690abc..7f90f64d215327a0fe74e741b2c7034cee7fcef2 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 7d1bb33923eefb3dc44730d1871022804202c2a4..086f8ad2ea9a68df1b9a015bf66290bd58d09355 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 772e084b631c20e7bfc580bcb7a9c99ac8c76ba1..5c4184b33a8b2250dbe5cdcbb11e6025abc187cf 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 4887e935316cb15a916da4883004ba9cf62eaa50..8c8116e5234dd21533b1c46e77bfbcbe598af64e 100644
--- a/apps/user_webdavauth/l10n/pl.php
+++ b/apps/user_webdavauth/l10n/pl.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Uwierzytelnienie 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 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 6ddd00ccc3efa36105f416a5fcce7a76af134f41..6727219db427c573286460e1eb6202dc3109b709 100644
--- a/apps/user_webdavauth/l10n/pt_BR.php
+++ b/apps/user_webdavauth/l10n/pt_BR.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "Autenticação 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." => "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 d7e87b5c8d19c326eacbbe40394b9a253955fcc5..eec1a328e1d7dd6bd3ba6643e2a58256d221a0a9 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 9df490e81ecc4489b4f9e8227e96b5b87836b28f..bccd7d50e222651bcf589fd07c7bc5bbb09a357e 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 f12982fc406104f67ba64e6ea0c4694ff0e64bc7..ad3dfd2e67f29c8ddc7d735a242a332c1e587cdb 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 c4e6dfddc7bdc316e63a86912bd1553c126833aa..fa63b18569a5457fd101c9f3d7a36677cccb8846 100644
--- a/apps/user_webdavauth/l10n/sk_SK.php
+++ b/apps/user_webdavauth/l10n/sk_SK.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV overenie",
-"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 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 7c592723af680aaf9e96b75ac0681d4cce75af40..6bae847dc3485f2a11a8014945133517157d7fd0 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 518fcbe9be5d6a89f79ba9a047f011df2182d030..44ff078493c5617759f31deb97cea272f2265bf7 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 c79b35c27cdb434f7ac8a4712d00f08724e652fa..481b7710946ab3bd81ac70a42a66c031e021a15d 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 2bd1f685e656ec448ccf68f15104ce547b4d0869..3c84ef7104d7e52e973875d5170256e2123048f4 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 c495a39dce57845778cf779a29d66f65894b5055..06bf97c4b03d37c19e4ccacf8369f83d3a750640 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 03ced5f4aa27cb15be74c348234fe0e8ade77c06..7231d0c57085e504e304c26de209bf49b03758b4 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 66887df54b51295cea65e22c7de385efe8ae44ff..2f4d3c95da32376077b9b93c0d4253856bdd0c11 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 ee2aa0891259b8874343f01577a6c50509c08b8f..53f1e1c4209914c6778c3682c5a327b5eae81060 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 72d2a0c11dff21a2b782198213f5deabbef34a66..5a935f17125e4dcef84cf0cbd206efb43ae85fa7 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 6f94b77ac5794f6a4eaba19d43b687e8b26643ca..32166b04751f45b37b86de7213bb8f033cf51966 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 ec6524ee4f79a9029b4441b465f1cee8270d6db5..e199c32675c5c198fee0395e876ce4668136f0bc 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 6417e45434dc4c3f23c1c12438f59a38a8001e76..86e5b916f3d26fa91872cd7247a8c7870d16bbf7 100755
--- a/apps/user_webdavauth/user_webdavauth.php
+++ b/apps/user_webdavauth/user_webdavauth.php
@@ -41,19 +41,25 @@ 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;
 
 		}
 		$returncode= substr($headers[0], 9, 3);
 
-		if(($returncode=='401') or ($returncode=='403')) {
-			return(false);
-		}else{
-			return($uid);
+		if(substr($returncode, 0, 1) === '2') {
+			return $uid;
+		} else {
+			return false;
 		}
 
 	}
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 5854b65aa03161248d92125567aa0a55b8232258..bdcb61284ecdd8603a7165790c4d7420fed49d53 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 6015a901eb795c24c424b3d0c02f4367c2dc344d..db00da022397445b38b87903ec0ec8048a3f88d7 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 def4e60d74db6694b6516e7c6344e7454c7002c3..a2d1b20d3a510f935e003deeb099c08d6508ff4d 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 78671a7bc11fccc4eae6c221d561fe3d16de9525..40a17a42876c3b939f0cda97eafdcc83705f2688 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -37,7 +37,7 @@ filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endC
 
 
 /* INPUTS */
-input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"],
+input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="url"],
 textarea, select,
 button, .button,
 #quota, div.jp-progress, .pager li a {
@@ -48,11 +48,11 @@ button, .button,
 	-moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em;
 }
 input[type="hidden"] { height:0; width:0; }
-input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], textarea {
+input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="url"], textarea {
 	background:#f8f8f8; color:#555; cursor:text;
 	font-family: inherit; /* use default ownCloud font instead of default textarea monospace */
 }
-input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"] {
+input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="url"] {
 	-webkit-appearance:textfield; -moz-appearance:textfield;
 	-webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box;
 }
@@ -61,6 +61,7 @@ input[type="password"]:hover, input[type="password"]:focus, input[type="password
 input[type="number"]:hover, input[type="number"]:focus, input[type="number"]:active,
 .searchbox input[type="search"]:hover, .searchbox input[type="search"]:focus, .searchbox input[type="search"]:active,
 input[type="email"]:hover, input[type="email"]:focus, input[type="email"]:active,
+input[type="url"]:hover, input[type="url"]:focus, input[type="url"]:active,
 textarea:hover, textarea:focus, textarea:active {
 	background-color:#fff; color:#333;
 	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1;
@@ -140,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; }
 
@@ -354,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; }
 
@@ -426,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 ---- */
@@ -640,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 0000000000000000000000000000000000000000..6a1caaa9188d02bb3001b74d3525d77b58934d2a
Binary files /dev/null and b/core/img/logo-mail.gif differ
diff --git a/core/js/config.php b/core/js/config.php
index 53a8fb96388601b1f8e57e387fbee1076892ae91..dd46f7889d155ab80ff00fef7fcc892da516070e 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -26,8 +26,6 @@ $array = array(
 	"oc_debug" => (defined('DEBUG') && DEBUG) ? 'true' : 'false',
 	"oc_webroot" => "\"".OC::$WEBROOT."\"",
 	"oc_appswebroots" =>  str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution
-	"oc_current_user" => "document.getElementsByTagName('head')[0].getAttribute('data-user')",
-	"oc_requesttoken" => "document.getElementsByTagName('head')[0].getAttribute('data-requesttoken')",
 	"datepickerFormatDate" => json_encode($l->l('jsdate', 'jsdate')),
 	"dayNames" =>  json_encode(
 		array(
diff --git a/core/js/js.js b/core/js/js.js
index 3cb4d3dd151582915626c2363dc106b4a7de1fc3..08b429a555b3d0e459a5ec008d22082fe52cef25 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -7,7 +7,10 @@
  */
 var oc_debug;
 var oc_webroot;
-var oc_requesttoken;
+
+var oc_current_user = document.getElementsByTagName('head')[0].getAttribute('data-user');
+var oc_requesttoken = document.getElementsByTagName('head')[0].getAttribute('data-requesttoken');
+
 if (typeof oc_webroot === "undefined") {
 	oc_webroot = location.pathname.substr(0, location.pathname.lastIndexOf('/'));
 }
diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index 463c397d8cd835bd0112aa5e9cec7fe9147987a7..48d521e18568ba2708db411e0c927eac44ab17c1 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 f5f27d2af58836e9f182e7f3b277473c24ebc7a6..4878c75eddeac38525afc02e568ddabbff154f8e 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 8bd4429338a339d7e9f1ddfb6a5fe75a1169b574..7ac7a564c35ac1fe58ed81846a5ac7ed12b48b3f 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 6c04907e15b1b182140fd560f345f00f7c92f38d..490bea9b1707f8f1ed0355cc797fbd71b522a86d 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 218bbce04aa2fff3900d8f754c5b6147826cd148..c775d2fb6af952c190a7ea31b252fb044b990931 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 0000000000000000000000000000000000000000..6b65cf81f2893e87a33a7b247a92230914ca1390
--- /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 dad970d41794cddefb1eea32eba939abe6293952..e66571fc75f1075f966486d84fa7e9b8daeda11b 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 are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. Si sabeu què fer, contacteu amb l'administrador abans de continuar. Voleu continuar?",
+"Yes, I really want to reset my password now" => "Sí, vull restablir ara la contrasenya",
 "Request reset" => "Sol·licita reinicialització",
 "Your password was reset" => "La vostra contrasenya s'ha reinicialitzat",
 "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 06cf7c214be0f0811a15e8f493496755b58c853c..9eca3af105213c74c500af017276aeb82fa63b11 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",
@@ -46,6 +43,7 @@
 "years ago" => "před lety",
 "Choose" => "Vybrat",
 "Cancel" => "Zrušit",
+"Error loading file picker template" => "Chyba při načítání šablony výběru souborů",
 "Yes" => "Ano",
 "No" => "Ne",
 "Ok" => "Ok",
@@ -92,6 +90,7 @@
 "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",
+"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í",
@@ -104,6 +103,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í",
@@ -124,7 +125,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.",
@@ -134,6 +134,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 cdb2576d4576a332f4bb01abb11eeda292eb8cb0..6158a356dc7015de00b1afa34cabde1ebd7d3ee5 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 4e9f742e80d0bd8a2947c1b05d7dcd6e41f0c5ed..b3da17ba79887cd063b689eb9de845e9f24f5735 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",
@@ -88,6 +85,8 @@
 "The update was successful. Redirecting you to ownCloud now." => "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud.",
 "ownCloud password reset" => "Nulstil ownCloud kodeord",
 "Use the following link to reset your password: {link}" => "Anvend følgende link til at nulstille din adgangskode: {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 ." => "Linket til at nulstille dit kodeord er blevet sendt til din e-post. <br> Hvis du ikke modtager den inden for en rimelig tid, så tjek dine spam / junk mapper.<br> Hvis det ikke er der, så spørg din lokale administrator.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Anmodning mislykkedes!<br>Er du sikker på at din e-post / brugernavn var korrekt?",
 "You will receive a link to reset your password via Email." => "Du vil modtage et link til at nulstille dit kodeord via email.",
 "Username" => "Brugernavn",
 "Request reset" => "Anmod om nulstilling",
@@ -102,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",
@@ -122,7 +122,7 @@
 "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!",
 "If you did not change your password recently, your account may be compromised!" => "Hvis du ikke har ændret din adgangskode for nylig, har nogen muligvis tiltvunget sig adgang til din konto!",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 62e9925b945308eb6644232aa97e17854f995d15..bf301b117908ae6bb17180c12d9ec6c8fe67daf2 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.",
@@ -46,6 +42,7 @@
 "years ago" => "Vor Jahren",
 "Choose" => "Auswählen",
 "Cancel" => "Abbrechen",
+"Error loading file picker template" => "Dateiauswahltemplate konnte nicht geladen werden",
 "Yes" => "Ja",
 "No" => "Nein",
 "Ok" => "OK",
@@ -104,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",
@@ -124,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 ea8a4e5adc3d8e4b7405a1254c56820c8c1fe036..e7842eb1576c488d6b4ebaf3cc7ae618682c23db 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -1,8 +1,5 @@
 <?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",
+"%s shared »%s« with you" => "%s geteilt »%s« mit Ihnen",
 "Category type not provided." => "Kategorie nicht angegeben.",
 "No category to add?" => "Keine Kategorie hinzuzufügen?",
 "This category already exists: %s" => "Die nachfolgende Kategorie existiert bereits: %s",
@@ -93,6 +90,8 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adresse/Nutzername korrekt waren?",
 "You will receive a link to reset your password via Email." => "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
 "Username" => "Benutzername",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keinen Weg geben, um Ihre Daten wieder zu bekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
+"Yes, I really want to reset my password now" => "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.",
 "Request reset" => "Zurücksetzung anfordern",
 "Your password was reset" => "Ihr Passwort wurde zurückgesetzt.",
 "To login page" => "Zur Login-Seite",
@@ -105,6 +104,8 @@
 "Help" => "Hilfe",
 "Access forbidden" => "Zugriff verboten",
 "Cloud not found" => "Cloud wurde nicht gefunden",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo,\n\nich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.\nSchauen Sie es sich an: %s\n\nViele Grüße!",
+"web services under your control" => "Web-Services unter Ihrer Kontrolle",
 "Edit categories" => "Kategorien ändern",
 "Add" => "Hinzufügen",
 "Security Warning" => "Sicherheitshinweis",
@@ -125,7 +126,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!",
@@ -135,6 +135,7 @@
 "remember" => "merken",
 "Log in" => "Einloggen",
 "Alternative Logins" => "Alternative Logins",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo,<br><br>ich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.<br><a href=\"%s\">Schauen Sie es sich an!</a><br><br>Viele Grüße!",
 "prev" => "Zurück",
 "next" => "Weiter",
 "Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern."
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 11295105e311fcbbdd596de21c4d23c7cea9d3ee..022d9d90039e02adc5ea8fb6208e9a2fb778707f 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.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",
@@ -92,6 +89,8 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Η αίτηση απέτυχε! Βεβαιωθηκατε ότι το email σας / username ειναι σωστο? ",
 "You will receive a link to reset your password via Email." => "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.",
 "Username" => "Όνομα χρήστη",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί ανάκτησης, δεν υπάρχει περίπτωση να έχετε πρόσβαση στα δεδομένα σας μετά την επαναφορά του συνθηματικού. Εάν δεν είστε σίγουροι τι να κάνετε, παρακαλώ επικοινωνήστε με τον διαχειριστή πριν συνεχίσετε. Θέλετε να συνεχίσετε;",
+"Yes, I really want to reset my password now" => "Ναι, θέλω να επαναφέρω το συνθηματικό μου τώρα.",
 "Request reset" => "Επαναφορά αίτησης",
 "Your password was reset" => "Ο κωδικός πρόσβασής σας επαναφέρθηκε",
 "To login page" => "Σελίδα εισόδου",
@@ -104,6 +103,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" => "Προειδοποίηση Ασφαλείας",
@@ -124,7 +125,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!" => "Εάν δεν αλλάξατε το συνθηματικό σας προσφάτως, ο λογαριασμός μπορεί να έχει διαρρεύσει!",
@@ -133,6 +134,7 @@
 "remember" => "απομνημόνευση",
 "Log in" => "Είσοδος",
 "Alternative Logins" => "Εναλλακτικές Συνδέσεις",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Γεια σας,<br><br>σας ενημερώνουμε ότι ο %s διαμοιράστηκε μαζί σας το »%s«.<br><a href=\"%s\">Δείτε το!</a><br><br>Γεια χαρά!",
 "prev" => "προηγούμενο",
 "next" => "επόμενο",
 "Updating ownCloud to version %s, this may take a while." => "Ενημερώνοντας το ownCloud στην έκδοση %s,μπορεί να πάρει λίγο χρόνο."
diff --git a/core/l10n/en@pirate.php b/core/l10n/en@pirate.php
index 981d9a1ca0f326481cfa383fd15b3a7696dfe001..0c590d0b7587ceea92d7e3dcb08b83ce31535356 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 72cdf90c61e8d1bfaeb0a2b520581f1f7af91a07..2adf09d3a01ae408941d3a47e2f3be6222737311 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -1,10 +1,8 @@
 <?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",
+"%s shared »%s« with you" => "%s kunhavigis “%s” kun vi",
 "Category type not provided." => "Ne proviziĝis tipon de kategorio.",
 "No category to add?" => "Ĉu neniu kategorio estas aldonota?",
+"This category already exists: %s" => "Tiu kategorio jam ekzistas: %s",
 "Object type not provided." => "Ne proviziĝis tipon de objekto.",
 "%s ID not provided." => "Ne proviziĝis ID-on de %s.",
 "Error adding %s to favorites." => "Eraro dum aldono de %s al favoratoj.",
@@ -52,6 +50,7 @@
 "Error" => "Eraro",
 "The app name is not specified." => "Ne indikiĝis nomo de la aplikaĵo.",
 "The required file {file} is not installed!" => "La necesa dosiero {file} ne instaliĝis!",
+"Shared" => "Dividita",
 "Share" => "Kunhavigi",
 "Error while sharing" => "Eraro dum kunhavigo",
 "Error while unsharing" => "Eraro dum malkunhavigo",
@@ -82,10 +81,14 @@
 "Error setting expiration date" => "Eraro dum agordado de limdato",
 "Sending ..." => "Sendante...",
 "Email sent" => "La retpoŝtaĵo sendiĝis",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La ĝisdatigo estis malsukcese. Bonvolu raporti tiun problemon al la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouda komunumo</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud.",
 "ownCloud password reset" => "La pasvorto de ownCloud restariĝis.",
 "Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
+"Request failed!<br>Did you make sure your email/username was right?" => "La peto malsukcesis!<br />Ĉu vi certiĝis, ke via retpoŝto/uzantonomo ĝustas?",
 "You will receive a link to reset your password via Email." => "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
 "Username" => "Uzantonomo",
+"Yes, I really want to reset my password now" => "Jes, mi vere volas restarigi mian pasvorton nun",
 "Request reset" => "Peti rekomencigon",
 "Your password was reset" => "Via pasvorto rekomencis",
 "To login page" => "Al la ensaluta paĝo",
@@ -98,9 +101,13 @@
 "Help" => "Helpo",
 "Access forbidden" => "Aliro estas malpermesata",
 "Cloud not found" => "La nubo ne estas trovita",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Saluton:\n\nNi nur sciigas vin, ke %s kunhavigis %s kun vi.\nVidu ĝin: %s\n\nĜis!",
+"web services under your control" => "TTT-servoj regataj de vi",
 "Edit categories" => "Redakti kategoriojn",
 "Add" => "Aldoni",
 "Security Warning" => "Sekureca averto",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Via PHP versio estas sendefenda je la NULL bajto atako (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Bonvolu ĝisdatigi vian instalon de PHP por uzi ownCloud-on sekure.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ne disponeblas sekura generilo de hazardaj numeroj; bonvolu kapabligi la OpenSSL-kromaĵon por PHP.",
 "Create an <strong>admin account</strong>" => "Krei <strong>administran konton</strong>",
 "Advanced" => "Progresinta",
@@ -113,13 +120,17 @@
 "Database tablespace" => "Datumbaza tabelospaco",
 "Database host" => "Datumbaza gastigo",
 "Finish setup" => "Fini la instalon",
-"web services under your control" => "TTT-servoj regataj de vi",
+"%s is available. Get more information on how to update." => "%s haveblas. Ekhavi pli da informo pri kiel ĝisdatigi.",
 "Log out" => "Elsaluti",
+"Automatic logon rejected!" => "La aŭtomata ensaluto malakceptiĝis!",
 "If you did not change your password recently, your account may be compromised!" => "Se vi ne ŝanĝis vian pasvorton lastatempe, via konto eble kompromitas!",
 "Please change your password to secure your account again." => "Bonvolu ŝanĝi vian pasvorton por sekurigi vian konton ree.",
 "Lost your password?" => "Ĉu vi perdis vian pasvorton?",
 "remember" => "memori",
 "Log in" => "Ensaluti",
+"Alternative Logins" => "Alternativaj ensalutoj",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Saluton:<br /><br />Ni nur sciigas vin, ke %s kunhavigis “%s” kun vi.<br /><a href=\"%s\">Vidu ĝin</a><br /><br />Ĝis!",
 "prev" => "maljena",
-"next" => "jena"
+"next" => "jena",
+"Updating ownCloud to version %s, this may take a while." => "ownCloud ĝisdatiĝas al eldono %s, tio ĉi povas daŭri je iom da tempo."
 );
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 4b8d5c7b18903d6d4640d9588c85d816ed4e4ac4..f5caa232dc99afb94e423a02aba6bf5220130a29 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 are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?",
+"Yes, I really want to reset my password now" => "Sí. Realmente deseo resetear mi contraseña ahora",
 "Request reset" => "Solicitar restablecimiento",
 "Your password was reset" => "Su contraseña ha sido establecida",
 "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 38b0791b94bdce60fa678d271a88c97ca88c136f..77c3fb854b48a2d6a32d30f35d1fc35819da33fc 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -1,8 +1,5 @@
 <?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",
+"%s shared »%s« with you" => "%s compartió \"%s\" con vos",
 "Category type not provided." => "Tipo de categoría no provisto. ",
 "No category to add?" => "¿Ninguna categoría para añadir?",
 "This category already exists: %s" => "Esta categoría ya existe: %s",
@@ -46,6 +43,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,8 +86,12 @@
 "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",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Tus archivos están encriptados. Si no habilitaste la clave de recuperación, no vas a tener manera de obtener nuevamente tus datos después que se resetee tu contraseña. Si no estás seguro sobre qué hacer, ponete en contacto con el administrador antes de seguir. ¿Estás seguro/a de querer continuar?",
+"Yes, I really want to reset my password now" => "Sí, definitivamente quiero resetear mi contraseña ahora",
 "Request reset" => "Solicitar restablecimiento",
 "Your password was reset" => "Tu contraseña fue restablecida",
 "To login page" => "A la página de inicio de sesión",
@@ -102,6 +104,8 @@
 "Help" => "Ayuda",
 "Access forbidden" => "Acceso denegado",
 "Cloud not found" => "No se encontró ownCloud",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hola,\n\nSimplemente te informo que %s compartió %s con vos.\nMiralo acá: %s\n\n¡Chau!",
+"web services under your control" => "servicios web controlados por vos",
 "Edit categories" => "Editar categorías",
 "Add" => "Agregar",
 "Security Warning" => "Advertencia de seguridad",
@@ -122,7 +126,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!",
@@ -131,6 +135,7 @@
 "remember" => "recordame",
 "Log in" => "Entrar",
 "Alternative Logins" => "Nombre alternativos de usuarios",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hola,<br><br>Simplemente te informo que %s compartió %s con vos.<br><a href=\"%s\">Miralo acá:</a><br><br>¡Chau!",
 "prev" => "anterior",
 "next" => "siguiente",
 "Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, puede domorar un rato."
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 803b36e1c31fe33c21fac1677ac1f93d67d4defb..4c0a41c5087f095c3012c1995fe362830e080c37 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 1ec4ee8f5c4a8523aa89e9ed5b3c3cb45aa91cfa..117c0105756bca682e59bb3453e1dc78a7268cdd 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 fb8a312587c99b12c562d0dbe358b646d1a6fccd..338b3ad4b217a7b09f51b1c7080727fd95815a8d 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 1f7a01e0e06950ebbc22fdfe1eeb79f66f450f64..3e471ad19428ccbfee1fe7f0fb53e43e2bbbbb48 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -1,8 +1,5 @@
 <?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",
+"%s shared »%s« with you" => "%s jakoi kohteen »%s« kanssasi",
 "Category type not provided." => "Luokan tyyppiä ei määritelty.",
 "No category to add?" => "Ei lisättävää luokkaa?",
 "This category already exists: %s" => "Luokka on jo olemassa: %s",
@@ -87,6 +84,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Pyyntö epäonnistui!<br>Olihan sähköpostiosoitteesi/käyttäjätunnuksesi oikein?",
 "You will receive a link to reset your password via Email." => "Saat sähköpostitse linkin nollataksesi salasanan.",
 "Username" => "Käyttäjätunnus",
+"Yes, I really want to reset my password now" => "Kyllä, haluan nollata salasanani nyt",
 "Request reset" => "Tilaus lähetetty",
 "Your password was reset" => "Salasanasi nollattiin",
 "To login page" => "Kirjautumissivulle",
@@ -99,6 +97,8 @@
 "Help" => "Ohje",
 "Access forbidden" => "Pääsy estetty",
 "Cloud not found" => "Pilveä ei löydy",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hei!\n\n%s jakoi kohteen %s kanssasi.\nKatso se tästä: %s\n\nNäkemiin!",
+"web services under your control" => "verkkopalvelut hallinnassasi",
 "Edit categories" => "Muokkaa luokkia",
 "Add" => "Lisää",
 "Security Warning" => "Turvallisuusvaroitus",
@@ -118,7 +118,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!",
@@ -128,6 +127,7 @@
 "remember" => "muista",
 "Log in" => "Kirjaudu sisään",
 "Alternative Logins" => "Vaihtoehtoiset kirjautumiset",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hei!<br><br>%s jakoi kohteen »%s« kanssasi.<br><a href=\"%s\">Katso se tästä!</a><br><br>Näkemiin!",
 "prev" => "edellinen",
 "next" => "seuraava",
 "Updating ownCloud to version %s, this may take a while." => "Päivitetään ownCloud versioon %s, tämä saattaa kestää hetken."
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index b01625a887b86102fb8be013944350b1a50151f6..2d1181bfec4ca8fd8e20a933b7bd9066d66af2e1 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",
@@ -46,6 +43,7 @@
 "years ago" => "il y a plusieurs années",
 "Choose" => "Choisir",
 "Cancel" => "Annuler",
+"Error loading file picker template" => "Erreur de chargement du modèle du sélecteur de fichier",
 "Yes" => "Oui",
 "No" => "Non",
 "Ok" => "Ok",
@@ -92,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 are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura plus aucun moyen de récupérer vos données une fois le mot de passe réinitialisé. Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. Voulez-vous vraiment continuer ?",
+"Yes, I really want to reset my password now" => "Oui, je veux vraiment réinitialiser mon mot de passe maintenant",
 "Request reset" => "Demander la réinitialisation",
 "Your password was reset" => "Votre mot de passe a été réinitialisé",
 "To login page" => "Retour à la page d'authentification",
@@ -104,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é",
@@ -124,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 !",
@@ -134,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 986526954468b66caf8ed52aa4dd5f6555bc7925..db53a3e8a4b77faf461fb46b6eb24248adffb04f 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 are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Os ficheiros están cifrados. Se aínda non activou a chave de recuperación non haberá xeito de recuperar os datos unha vez que se teña restabelecido o contrasinal. Se non ten certeza do que ten que facer, póñase en contacto co administrador antes de continuar. Confirma que quere continuar?",
+"Yes, I really want to reset my password now" => "Si, confirmo que quero restabelecer agora o meu contrasinal",
 "Request reset" => "Petición de restabelecemento",
 "Your password was reset" => "O contrasinal foi restabelecido",
 "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 eb2c3f3d1538979af80d18e97af9cff8942247c4..1095507673b931cb188846a6c403977c8e5ee1ea 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",
@@ -46,6 +42,7 @@
 "years ago" => "שנים",
 "Choose" => "בחירה",
 "Cancel" => "ביטול",
+"Error loading file picker template" => "שגיאה בטעינת תבנית בחירת הקבצים",
 "Yes" => "כן",
 "No" => "לא",
 "Ok" => "בסדר",
@@ -88,6 +85,8 @@
 "The update was successful. Redirecting you to ownCloud now." => "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud.",
 "ownCloud password reset" => "איפוס הססמה של ownCloud",
 "Use the following link to reset your password: {link}" => "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {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 ." => "הקישור לאיפוס הססמה שלך נשלח אליך בדוא״ל.<br>אם לא קיבלת את הקישור תוך זמן סביר, מוטב לבדוק את תיבת הזבל שלך.<br>אם ההודעה לא שם, כדאי לשאול את מנהל הרשת שלך .",
+"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" => "שם משתמש",
 "Request reset" => "בקשת איפוס",
@@ -102,10 +101,12 @@
 "Help" => "עזרה",
 "Access forbidden" => "הגישה נחסמה",
 "Cloud not found" => "ענן לא נמצא",
+"web services under your control" => "שירותי רשת תחת השליטה שלך",
 "Edit categories" => "ערוך קטגוריות",
 "Add" => "הוספה",
 "Security Warning" => "אזהרת אבטחה",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "גרסת ה־PHP פגיעה בפני התקפת בית NULL/ריק (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "נא לעדכן את התקנת ה־PHP שלך כדי להשתמש ב־PHP בבטחה.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "אין מחולל מספרים אקראיים מאובטח, נא להפעיל את ההרחבה OpenSSL ב־PHP.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ללא מחולל מספרים אקראיים מאובטח תוקף יכול לנבא את מחרוזות איפוס הססמה ולהשתלט על החשבון שלך.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "תיקיית וקבצי המידע שלך כנראה נגישים מהאינטרנט מכיוון שקובץ ה.htaccess לא עובד.",
@@ -121,7 +122,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/hi.php b/core/l10n/hi.php
index 7d55c5b6b2f9aab1e95e080f0d0ef1d25a5822b6..afdd91d5f83072d263e3fc33539d5adc97db6973 100644
--- a/core/l10n/hi.php
+++ b/core/l10n/hi.php
@@ -1,5 +1,19 @@
 <?php $TRANSLATIONS = array(
+"January" => "जनवरी",
+"February" => "फरवरी",
+"March" => "मार्च",
+"April" => "अप्रैल",
+"May" => "मई",
+"June" => "जून",
+"July" => "जुलाई",
+"August" => "अगस्त",
+"September" => "सितम्बर",
+"October" => "अक्टूबर",
+"November" => "नवंबर",
+"December" => "दिसम्बर",
 "Settings" => "सेटिंग्स",
+"Share" => "साझा करें",
+"Share with" => "के साथ साझा",
 "Password" => "पासवर्ड",
 "Use the following link to reset your password: {link}" => "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}",
 "You will receive a link to reset your password via Email." => "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 660b47c54fdbb0b9566a27e9c93cd617e2229e17..80a34094b2705745a3abca24400192dd06343d85 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 766e1bfc7eaff091e23667c32c61bc2b00123246..a0b6979c4ba6c38ea7d9046077d0bfdda5cdb32c 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -1,8 +1,5 @@
 <?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",
+"%s shared »%s« with you" => "%s megosztotta Önnel ezt:  »%s«",
 "Category type not provided." => "Nincs megadva a kategória típusa.",
 "No category to add?" => "Nincs hozzáadandó kategória?",
 "This category already exists: %s" => "Ez a kategória már létezik: %s",
@@ -93,6 +90,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "A kérést nem sikerült teljesíteni! <br>Biztos, hogy jó emailcímet/felhasználónevet adott meg?",
 "You will receive a link to reset your password via Email." => "Egy emailben fog értesítést kapni a jelszóbeállítás módjáról.",
 "Username" => "Felhasználónév",
+"Yes, I really want to reset my password now" => "Igen, tényleg meg akarom változtatni a jelszavam",
 "Request reset" => "Visszaállítás igénylése",
 "Your password was reset" => "Jelszó megváltoztatva",
 "To login page" => "A bejelentkező ablakhoz",
@@ -105,6 +103,8 @@
 "Help" => "Súgó",
 "Access forbidden" => "A hozzáférés nem engedélyezett",
 "Cloud not found" => "A felhő nem található",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Üdv!\n\nÚj hír: %s megosztotta Önnel ezt: %s.\nItt nézhető meg: %s\n\nMinden jót!",
+"web services under your control" => "webszolgáltatások saját kézben",
 "Edit categories" => "Kategóriák szerkesztése",
 "Add" => "Hozzáadás",
 "Security Warning" => "Biztonsági figyelmeztetés",
@@ -125,7 +125,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!",
@@ -135,6 +134,7 @@
 "remember" => "emlékezzen",
 "Log in" => "Bejelentkezés",
 "Alternative Logins" => "Alternatív bejelentkezés",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Üdv!<br><br>Új hír: %s megosztotta Önnel ezt:  »%s«.<br><a href=\"%s\">Itt nézhető meg!</a><br><br>Minden jót!",
 "prev" => "előző",
 "next" => "következő",
 "Updating ownCloud to version %s, this may take a while." => "Owncloud frissítés a %s verzióra folyamatban. Kis türelmet."
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index b6bb75f2b3becfca76fcae938bff18303dcd03b4..9df7eda1dad523f5f4c5671732dd42c7e9b48639 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 065a4f2e72771e452bcb0ecb3fbee51c5467e17c..5fe8b542223ff871bd366254ade9b81bc17ea405 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 bd8b58b29049eedc0dfe99563eb049e587ad068f..b8573b3624a869149b58ddbb1c93ea7a077edc4e 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.",
@@ -52,6 +48,7 @@
 "Error" => "Villa",
 "The app name is not specified." => "Nafn forrits ekki tilgreint",
 "The required file {file} is not installed!" => "Umbeðina skráin {file} ekki tiltæk!",
+"Shared" => "Deilt",
 "Share" => "Deila",
 "Error while sharing" => "Villa við deilingu",
 "Error while unsharing" => "Villa við að hætta deilingu",
@@ -82,6 +79,7 @@
 "Error setting expiration date" => "Villa við að setja gildistíma",
 "Sending ..." => "Sendi ...",
 "Email sent" => "Tölvupóstur sendur",
+"The update was successful. Redirecting you to ownCloud now." => "Uppfærslan heppnaðist. Beini þér til ownCloud nú.",
 "ownCloud password reset" => "endursetja ownCloud lykilorð",
 "Use the following link to reset your password: {link}" => "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}",
 "You will receive a link to reset your password via Email." => "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið.",
@@ -98,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",
@@ -114,7 +113,7 @@
 "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ð!",
 "If you did not change your password recently, your account may be compromised!" => "Ef þú breyttir ekki lykilorðinu þínu fyrir skömmu, er mögulegt að einhver annar hafi komist inn á aðganginn þinn.",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index ce8f6411295657f8c4205ebf22b97800eea10a7d..f14e4fbb3137dd1bb9b7a487c44caca4226356ab 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 ha condiviso »%s« con te",
 "Category type not provided." => "Tipo di categoria non fornito.",
 "No category to add?" => "Nessuna categoria da aggiungere?",
 "This category already exists: %s" => "Questa categoria esiste già: %s",
@@ -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 are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "I file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà ripristinata. Se non sei sicuro, per favore contatta l'amministratore prima di proseguire. Vuoi davvero continuare?",
+"Yes, I really want to reset my password now" => "Sì, voglio davvero ripristinare la mia password adesso",
 "Request reset" => "Richiesta di ripristino",
 "Your password was reset" => "La password è stata ripristinata",
 "To login page" => "Alla pagina di accesso",
@@ -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\nSaluti!",
+"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>Saluti!",
 "prev" => "precedente",
 "next" => "successivo",
 "Updating ownCloud to version %s, this may take a while." => "Aggiornamento di ownCloud alla versione %s in corso, ciò potrebbe richiedere del tempo."
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 8395a1d272eb810bfaf36ccd184c4e105fa9f5d9..b1c8b9a438e97116ea1c7f77ef5f5ba9380b67c3 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 are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "ファイルが暗号化されています。復旧キーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかよくわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？",
+"Yes, I really want to reset my password now" => "はい、今すぐパスワードをリセットします。",
 "Request reset" => "リセットを要求します。",
 "Your password was reset" => "あなたのパスワードはリセットされました。",
 "To login page" => "ログインページへ戻る",
@@ -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 b474548eae84b5444a87cf37444c0e5b834723e4..6674106f1d7aa55974cf2133b211aac3063be95a 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 6b97d672cfd16243adf162611e210930e2fe1c4a..d95daaa3a739614d1f751b9b7b0dc27333079eb2 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 3c223bad02447851cda6bd036c2eff6e0108997a..ab46b13a50067a0025643199581d69ca04e7943d 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 4c312df6618c974f3cbffe9ba995a434d5238c6b..dbe7a34de3433835da889142bd2c745236d92209 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 1cd400117c8336afa625f31bf80b87ae6ef32ef7..673ee83dca018f938610c31a601ca97c0fffc6c3 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -1,8 +1,12 @@
 <?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",
+"Category type not provided." => "Kategorija nenurodyta.",
 "No category to add?" => "NepridÄ—site jokios kategorijos?",
+"This category already exists: %s" => "Å i kategorija jau egzistuoja: %s",
+"Object type not provided." => "Objekto tipas nenurodytas.",
+"%s ID not provided." => "%s ID nenurodytas.",
+"Error adding %s to favorites." => "Klaida perkeliant %s į jūsų mėgstamiausius.",
 "No categories selected for deletion." => "Trynimui nepasirinkta jokia kategorija.",
+"Error removing %s from favorites." => "Klaida ištrinant %s iš jūsų mėgstamiausius.",
 "Sunday" => "Sekmadienis",
 "Monday" => "Pirmadienis",
 "Tuesday" => "Antradienis",
@@ -26,19 +30,27 @@
 "seconds ago" => "prieš sekundę",
 "1 minute ago" => "Prieš 1 minutę",
 "{minutes} minutes ago" => "Prieš {count} minutes",
+"1 hour ago" => "prieš 1 valandą",
+"{hours} hours ago" => "prieš {hours} valandas",
 "today" => "Å¡iandien",
 "yesterday" => "vakar",
 "{days} days ago" => "Prieš {days}  dienas",
 "last month" => "praeitą mėnesį",
+"{months} months ago" => "prieš {months} mėnesių",
 "months ago" => "prieš mėnesį",
 "last year" => "praeitais metais",
 "years ago" => "prieš metus",
 "Choose" => "Pasirinkite",
 "Cancel" => "Atšaukti",
+"Error loading file picker template" => "Klaida pakraunant failų naršyklę",
 "Yes" => "Taip",
 "No" => "Ne",
 "Ok" => "Gerai",
+"The object type is not specified." => "Objekto tipas nenurodytas.",
 "Error" => "Klaida",
+"The app name is not specified." => "Nenurodytas programos pavadinimas.",
+"The required file {file} is not installed!" => "Reikalingas {file} failas nėra įrašytas!",
+"Shared" => "Dalinamasi",
 "Share" => "Dalintis",
 "Error while sharing" => "Klaida, dalijimosi metu",
 "Error while unsharing" => "Klaida, kai atšaukiamas dalijimasis",
@@ -49,6 +61,8 @@
 "Share with link" => "Dalintis nuoroda",
 "Password protect" => "Apsaugotas slaptažodžiu",
 "Password" => "Slaptažodis",
+"Email link to person" => "Nusiųsti nuorodą paštu",
+"Send" => "Siųsti",
 "Set expiration date" => "Nustatykite galiojimo laikÄ…",
 "Expiration date" => "Galiojimo laikas",
 "Share via email:" => "Dalintis per el. paštą:",
@@ -65,8 +79,14 @@
 "Password protected" => "Apsaugota slaptažodžiu",
 "Error unsetting expiration date" => "Klaida nuimant galiojimo laikÄ…",
 "Error setting expiration date" => "Klaida nustatant galiojimo laikÄ…",
+"Sending ..." => "Siunčiama...",
+"Email sent" => "Laiškas išsiųstas",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Atnaujinimas buvo nesėkmingas. PApie tai prašome pranešti the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud bendruomenei</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.",
 "ownCloud password reset" => "ownCloud slaptažodžio atkūrimas",
 "Use the following link to reset your password: {link}" => "Slaptažodio atkūrimui naudokite šią nuorodą: {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 ." => "Nuorodą su jūsų slaptažodžio atkūrimu buvo nusiųsta jums į paštą.<br>Jei jo negausite per atitinkamą laiką, pasižiūrėkite brukalo aplankale.<br> Jei jo ir ten nėra, teiraukitės administratoriaus.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Klaida!<br>Ar tikrai jūsų el paštas/vartotojo vardas buvo teisingi?",
 "You will receive a link to reset your password via Email." => "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.",
 "Username" => "Prisijungimo vardas",
 "Request reset" => "Prašyti nustatymo iš najo",
@@ -81,11 +101,16 @@
 "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",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Jūsų PHP versija yra pažeidžiama prieš NULL Byte ataką (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Prašome atnaujinti savo PHP norint naudotis savo ownCloud saugiai.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Saugaus atsitiktinių skaičių generatoriaus nėra, prašome įjungti PHP OpenSSL modulį.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Be saugaus atsitiktinių skaičių generatoriaus, piktavaliai gali atspėti Jūsų slaptažodį ir pasisavinti paskyrą.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess failas neveikia.",
+"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>." => "Norint gauti daugiau informacijos apie tai kaip tinkamai nustatyit savo serverį, prašome perskaityti <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentaciją</a>.",
 "Create an <strong>admin account</strong>" => "Sukurti <strong>administratoriaus paskyrÄ…</strong>",
 "Advanced" => "IÅ¡plÄ—stiniai",
 "Data folder" => "Duomenų katalogas",
@@ -97,7 +122,7 @@
 "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!",
 "If you did not change your password recently, your account may be compromised!" => "Jei paskutinių metu nekeitėte savo slaptažodžio, Jūsų paskyra gali būti pavojuje!",
@@ -105,6 +130,8 @@
 "Lost your password?" => "Pamiršote slaptažodį?",
 "remember" => "prisiminti",
 "Log in" => "Prisijungti",
+"Alternative Logins" => "Alternatyvūs prisijungimai",
 "prev" => "atgal",
-"next" => "kitas"
+"next" => "kitas",
+"Updating ownCloud to version %s, this may take a while." => "Atnaujinama ownCloud į %s versiją. tai gali šiek tiek užtrukti."
 );
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index e3d668d0183a2754b490d9a8a847c68105192d8d..b8bfe74c3777fdc676b1f5daa6cd97a5166df454 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 b0c39debb8a042a2cad28af24a1102e9627ad562..de89403ee3ca53a8313a68c73388eba51a1bb188 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 e7dc73a32c15fc7a545f5e1cb057537363d50781..7a18acea7ccfe1f442d739fe19f5f0285a046806 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 6ea6a2c7bb52911c44f291c3b7b72002b1a06c7a..614c353929da7c34239c5d738ecd71269e1636ad 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 30d3f91df2ac2e37421bf22ffdab07af6bd343bb..d6d9675d32863ba4686e2f944aa19351b9691a1b 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 0f30a2f49aa0d360d8cdfc009ae67acbda70bc6f..1905092886eb907cf7a552c395752d3aa1ab6669 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -1,23 +1,20 @@
 <?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 jou",
 "Category type not provided." => "Categorie type niet opgegeven.",
-"No category to add?" => "Geen categorie toevoegen?",
+"No category to add?" => "Geen categorie om toe te voegen?",
 "This category already exists: %s" => "Deze categorie bestaat al: %s",
 "Object type not provided." => "Object type niet opgegeven.",
 "%s ID not provided." => "%s ID niet opgegeven.",
 "Error adding %s to favorites." => "Toevoegen van %s aan favorieten is mislukt.",
 "No categories selected for deletion." => "Geen categorie geselecteerd voor verwijdering.",
 "Error removing %s from favorites." => "Verwijderen %s van favorieten is mislukt.",
-"Sunday" => "Zondag",
-"Monday" => "Maandag",
-"Tuesday" => "Dinsdag",
-"Wednesday" => "Woensdag",
-"Thursday" => "Donderdag",
-"Friday" => "Vrijdag",
-"Saturday" => "Zaterdag",
+"Sunday" => "zondag",
+"Monday" => "maandag",
+"Tuesday" => "dinsdag",
+"Wednesday" => "woensdag",
+"Thursday" => "donderdag",
+"Friday" => "vrijdag",
+"Saturday" => "zaterdag",
 "January" => "januari",
 "February" => "februari",
 "March" => "maart",
@@ -63,13 +60,13 @@
 "Shared with you by {owner}" => "Gedeeld met u door {owner}",
 "Share with" => "Deel met",
 "Share with link" => "Deel met link",
-"Password protect" => "Wachtwoord beveiliging",
+"Password protect" => "Wachtwoord beveiligd",
 "Password" => "Wachtwoord",
 "Email link to person" => "E-mail link naar persoon",
 "Send" => "Versturen",
 "Set expiration date" => "Stel vervaldatum in",
 "Expiration date" => "Vervaldatum",
-"Share via email:" => "Deel via email:",
+"Share via email:" => "Deel via e-mail:",
 "No people found" => "Geen mensen gevonden",
 "Resharing is not allowed" => "Verder delen is niet toegestaan",
 "Shared in {item} with {user}" => "Gedeeld in {item} met {user}",
@@ -86,17 +83,19 @@
 "Sending ..." => "Versturen ...",
 "Email sent" => "E-mail verzonden",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
-"The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud.",
-"ownCloud password reset" => "ownCloud wachtwoord herstellen",
+"The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. Je wordt teruggeleid naar je eigen ownCloud.",
+"ownCloud password reset" => "ownCloud-wachtwoord herstellen",
 "Use the following link to reset your password: {link}" => "Gebruik de volgende link om je wachtwoord te resetten: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "De link voor het resetten van uw wachtwoord is verzonden naar uw e-mailadres.<br>Als u dat bericht niet snel ontvangen hebt, controleer dan uw spambakje.<br>Als het daar ook niet is, vraag dan uw beheerder om te helpen.",
-"Request failed!<br>Did you make sure your email/username was right?" => "Aanvraag mislukt!<br>Weet u zeker dat uw gebruikersnaam en/of wachtwoord goed waren?",
-"You will receive a link to reset your password via Email." => "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "De link voor het resetten van je wachtwoord is verzonden naar je e-mailadres.<br>Als je dat bericht niet snel ontvangen hebt, controleer dan uw spambakje.<br>Als het daar ook niet is, vraag dan je beheerder om te helpen.",
+"Request failed!<br>Did you make sure your email/username was right?" => "Aanvraag mislukt!<br>Weet je zeker dat je gebruikersnaam en/of wachtwoord goed waren?",
+"You will receive a link to reset your password via Email." => "Je ontvangt een link om je wachtwoord opnieuw in te stellen via e-mail.",
 "Username" => "Gebruikersnaam",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Je bestanden zijn versleuteld. Als je geen recoverykey hebt ingeschakeld is er geen manier om je data terug te krijgen indien je je wachtwoord reset!\nAls je niet weet wat te doen, neem dan alsjeblieft contact op met je administrator eer je doorgaat.\nWil je echt doorgaan?",
+"Yes, I really want to reset my password now" => "Ja, ik wil mijn wachtwoord nu echt resetten",
 "Request reset" => "Resetaanvraag",
 "Your password was reset" => "Je wachtwoord is gewijzigd",
 "To login page" => "Naar de login-pagina",
-"New password" => "Nieuw",
+"New password" => "Nieuw wachtwoord",
 "Reset password" => "Reset wachtwoord",
 "Personal" => "Persoonlijk",
 "Users" => "Gebruikers",
@@ -105,15 +104,17 @@
 "Help" => "Help",
 "Access forbidden" => "Toegang verboden",
 "Cloud not found" => "Cloud niet gevonden",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Hallo daar,\n\n%s deelde %s met jou.\nBekijk: %s\n\nVeel plezier!",
+"web services under your control" => "Webdiensten in eigen beheer",
 "Edit categories" => "Wijzig categorieën",
 "Add" => "Toevoegen",
 "Security Warning" => "Beveiligingswaarschuwing",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Uw PHP versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)",
-"Please update your PHP installation to use ownCloud securely." => "Werk uw PHP installatie bij om ownCloud veilig te kunnen gebruiken.",
-"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Er kon geen willekeurig nummer worden gegenereerd. Zet de PHP OpenSSL extentie aan.",
-"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Zonder random nummer generator is het mogelijk voor een aanvaller om de reset tokens van wachtwoorden te voorspellen. Dit kan leiden tot het inbreken op uw account.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess bestand niet werkt.",
-"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Informatie over het configureren van uw server is hier te vinden <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentatie</a>.",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Je PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)",
+"Please update your PHP installation to use ownCloud securely." => "Werk je PHP-installatie bij om ownCloud veilig te kunnen gebruiken.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Er kon geen willekeurig nummer worden gegenereerd. Zet de PHP OpenSSL-extentie aan.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Zonder random nummer generator is het mogelijk voor een aanvaller om de resettokens van wachtwoorden te voorspellen. Dit kan leiden tot het inbreken op uw account.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Je gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet werkt.",
+"For information how to properly configure your server, please see the <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentation</a>." => "Informatie over het configureren van uw server is <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">hier</a> te vinden.",
 "Create an <strong>admin account</strong>" => "Maak een <strong>beheerdersaccount</strong> aan",
 "Advanced" => "Geavanceerd",
 "Data folder" => "Gegevensmap",
@@ -123,19 +124,19 @@
 "Database password" => "Wachtwoord database",
 "Database name" => "Naam database",
 "Database tablespace" => "Database tablespace",
-"Database host" => "Database server",
+"Database host" => "Databaseserver",
 "Finish setup" => "Installatie afronden",
-"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!",
-"If you did not change your password recently, your account may be compromised!" => "Als u uw wachtwoord niet onlangs heeft aangepast, kan uw account overgenomen zijn!",
-"Please change your password to secure your account again." => "Wijzig uw wachtwoord zodat uw account weer beveiligd is.",
-"Lost your password?" => "Uw wachtwoord vergeten?",
+"If you did not change your password recently, your account may be compromised!" => "Als je je wachtwoord niet onlangs heeft aangepast, kan je account overgenomen zijn!",
+"Please change your password to secure your account again." => "Wijzig je wachtwoord zodat je account weer beveiligd is.",
+"Lost your password?" => "Wachtwoord vergeten?",
 "remember" => "onthoud gegevens",
 "Log in" => "Meld je aan",
 "Alternative Logins" => "Alternatieve inlogs",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Hallo daar,<br><br> %s deelde »%s« met jou.<br><a href=\"%s\">Bekijk!</a><br><br>Veel plezier!",
 "prev" => "vorige",
 "next" => "volgende",
-"Updating ownCloud to version %s, this may take a while." => "Updaten ownCloud naar versie %s, dit kan even duren."
+"Updating ownCloud to version %s, this may take a while." => "Updaten ownCloud naar versie %s, dit kan even duren..."
 );
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index de181ccc7ad791cb529555aa196d8a80dd02e19d..67dbe32ff6104793dd2f60cce242d3c3074b9453 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 1d14428f183743d2f2ce37de06f3ac08153d9f53..4440444885d8e84c25f6e27d6bd8f8a5b0e46890 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 045da821f2e0a6232aa46d74e79432cf162eeb50..4d05e4fcd54ff905ad0ae1356d508250490118d3 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -1,8 +1,5 @@
 <?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",
+"%s shared »%s« with you" => "%s Współdzielone »%s« z tobą",
 "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",
@@ -93,6 +90,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Żądanie niepowiodło się!<br>Czy Twój email/nazwa użytkownika są poprawne?",
 "You will receive a link to reset your password via Email." => "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.",
 "Username" => "Nazwa użytkownika",
+"Yes, I really want to reset my password now" => "Tak, naprawdę chcę zresetować hasło teraz",
 "Request reset" => "Żądanie resetowania",
 "Your password was reset" => "Zresetowano hasło",
 "To login page" => "Do strony logowania",
@@ -105,6 +103,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 +124,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 59c8f69aee719d93acd25c3da2f920b949213fa8..f57c0a29291636d79853d1e78221bb94d171e17c 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -1,8 +1,5 @@
 <?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",
+"%s shared »%s« with you" => "%s compartilhou »%s« com você",
 "Category type not provided." => "Tipo de categoria não fornecido.",
 "No category to add?" => "Nenhuma categoria a adicionar?",
 "This category already exists: %s" => "Esta categoria já existe: %s",
@@ -93,6 +90,8 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "O pedido falhou! <br>Certifique-se que seu e-mail/username estavam corretos?",
 "You will receive a link to reset your password via Email." => "Você receberá um link para redefinir sua senha por e-mail.",
 "Username" => "Nome de usuário",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Seus arquivos estão encriptados. Se você não habilitou a chave de recuperação, não haverá maneira de recuperar seus dados após criar uma nova senha. Se você não tem certeza do que fazer,  por favor entre em contato com o administrador antes de continuar. Tem certeza que realmente quer continuar?",
+"Yes, I really want to reset my password now" => "Sim, realmente quero criar uma nova senha.",
 "Request reset" => "Pedir redefinição",
 "Your password was reset" => "Sua senha foi redefinida",
 "To login page" => "Para a página de login",
@@ -105,6 +104,8 @@
 "Help" => "Ajuda",
 "Access forbidden" => "Acesso proibido",
 "Cloud not found" => "Cloud não encontrado",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Olá,\n\napenas para você saber que %s compartilhou %s com você.\nVeja: %s\n\nAbraços!",
+"web services under your control" => "serviços web sob seu controle",
 "Edit categories" => "Editar categorias",
 "Add" => "Adicionar",
 "Security Warning" => "Aviso de Segurança",
@@ -125,7 +126,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!",
@@ -135,6 +135,7 @@
 "remember" => "lembrar",
 "Log in" => "Fazer login",
 "Alternative Logins" => "Logins alternativos",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Olá,<br><br>apenas para você saber que %s compartilhou %s com você.<br><a href=\"%s\">Veja: </a><br><br>Abraços!",
 "prev" => "anterior",
 "next" => "próximo",
 "Updating ownCloud to version %s, this may take a while." => "Atualizando ownCloud para a versão %s, isto pode levar algum tempo."
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index f6de2db4fb6e184bdd0bbdb87460ecba64d2e17e..77c27b641d132ce8856894cc75640a0e063f335c 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 3d25a5f042bbec9e59d1f47e8d3ac37c152e2686..327fb72f4305a9495b35e1f648c11f9019adc8b3 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -1,9 +1,6 @@
 <?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",
+"%s shared »%s« with you" => "%s Partajat »%s« cu tine de",
+"Category type not provided." => "Tipul de categorie nu a fost specificat.",
 "No category to add?" => "Nici o categorie de adăugat?",
 "This category already exists: %s" => "Această categorie deja există: %s",
 "Object type not provided." => "Tipul obiectului nu este prevazut",
@@ -46,6 +43,7 @@
 "years ago" => "ani în urmă",
 "Choose" => "Alege",
 "Cancel" => "Anulare",
+"Error loading file picker template" => "Eroare la încărcarea șablonului selectorului de fișiere",
 "Yes" => "Da",
 "No" => "Nu",
 "Ok" => "Ok",
@@ -92,6 +90,8 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Cerere esuata!<br>Esti sigur ca email-ul/numele de utilizator sunt corecte?",
 "You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email",
 "Username" => "Nume utilizator",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Fișierele tale sunt criptate. Dacă nu ai activat o cheie de recuperare, nu va mai exista nici o metodă prin care să îți recuperezi datele după resetarea parole. Dacă nu ești sigur în privința la ce ai de făcut, contactează un administrator înainte să continuii. Chiar vrei să continui?",
+"Yes, I really want to reset my password now" => "Da, eu chiar doresc să îmi resetez parola acum",
 "Request reset" => "Cerere trimisă",
 "Your password was reset" => "Parola a fost resetată",
 "To login page" => "Spre pagina de autentificare",
@@ -104,6 +104,8 @@
 "Help" => "Ajutor",
 "Access forbidden" => "Acces interzis",
 "Cloud not found" => "Nu s-a găsit",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Salutare,\n\nVă aduc la cunoștință că %s a partajat %s cu tine.\nAccesează la: %s\n\nNumai bine!",
+"web services under your control" => "servicii web controlate de tine",
 "Edit categories" => "Editează categorii",
 "Add" => "Adaugă",
 "Security Warning" => "Avertisment de securitate",
@@ -124,7 +126,7 @@
 "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",
+"%s is available. Get more information on how to update." => "%s este disponibil. Vezi mai multe informații despre procesul de actualizare.",
 "Log out" => "Ieșire",
 "Automatic logon rejected!" => "Logare automata respinsa",
 "If you did not change your password recently, your account may be compromised!" => "Daca nu schimbi parola cand de curand , contul tau poate fi conpromis",
@@ -133,6 +135,7 @@
 "remember" => "amintește",
 "Log in" => "Autentificare",
 "Alternative Logins" => "Conectări alternative",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Salutare, <br><br>Vă aduc la cunoștință că %s a partajat %s cu tine.<br><a href=\"%s\">Accesează-l!</a><br><br>Numai bine!",
 "prev" => "precedentul",
 "next" => "următorul",
 "Updating ownCloud to version %s, this may take a while." => "Actualizăm ownCloud la versiunea %s, aceasta poate dura câteva momente."
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 608b9271df5e7e889b903fa20bf5d3a8306d2812..17e6150f9089fcbad1c89f60dd6f231c62ac7307 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.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,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Что-то не так. Вы уверены что Email / Имя пользователя указаны верно?",
 "You will receive a link to reset your password via Email." => "На ваш адрес Email выслана ссылка для сброса пароля.",
 "Username" => "Имя пользователя",
+"Yes, I really want to reset my password now" => "Да, я действительно хочу сбросить свой пароль",
 "Request reset" => "Запросить сброс",
 "Your password was reset" => "Ваш пароль был сброшен",
 "To login page" => "На страницу авторизации",
@@ -105,6 +103,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 +125,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 +134,7 @@
 "remember" => "запомнить",
 "Log in" => "Войти",
 "Alternative Logins" => "Альтернативные имена пользователя",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Приветствую,<br><br>просто даю знать, что %s поделился »%s« с вами.<br><a href=\"%s\">Посмотреть!</a><br><br>Удачи!",
 "prev" => "пред",
 "next" => "след",
 "Updating ownCloud to version %s, this may take a while." => "Производится обновление ownCloud до версии %s. Это может занять некоторое время."
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index be7c1a24aad895bb0d9d7693a7ff80f17fca0ee2..b27f1c6c985fb221269f8688b3dfc9c64820ee17 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 2dfaa01b5a1f9d2bfacd0ba374adf8ce5fde5425..ead3842e4527f808506d502e58b4805015a89966 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -1,8 +1,5 @@
 <?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",
+"%s shared »%s« with you" => "%s s Vami zdieľa »%s«",
 "Category type not provided." => "Neposkytnutý typ kategórie.",
 "No category to add?" => "Žiadna kategória pre pridanie?",
 "This category already exists: %s" => "Kategória: %s už existuje.",
@@ -46,6 +43,7 @@
 "years ago" => "pred rokmi",
 "Choose" => "Výber",
 "Cancel" => "Zrušiť",
+"Error loading file picker template" => "Chyba pri načítaní šablóny výberu súborov",
 "Yes" => "Áno",
 "No" => "Nie",
 "Ok" => "Ok",
@@ -92,6 +90,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "Požiadavka zlyhala.<br>Uistili ste sa, že Vaše používateľské meno a email sú správne?",
 "You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržíte e-mailom.",
 "Username" => "Meno používateľa",
+"Yes, I really want to reset my password now" => "Áno, želám si teraz obnoviť svoje heslo",
 "Request reset" => "Požiadať o obnovenie",
 "Your password was reset" => "Vaše heslo bolo obnovené",
 "To login page" => "Na prihlasovaciu stránku",
@@ -104,6 +103,8 @@
 "Help" => "Pomoc",
 "Access forbidden" => "Prístup odmietnutý",
 "Cloud not found" => "Nenájdené",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!" => "Ahoj,\n\nChcem Vám oznámiť, že %s s Vami zdieľa %s.\nPozrieť si to môžete tu: %s\n\nVďaka",
+"web services under your control" => "webové služby pod Vašou kontrolou",
 "Edit categories" => "Upraviť kategórie",
 "Add" => "Pridať",
 "Security Warning" => "Bezpečnostné varovanie",
@@ -124,7 +125,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é!",
@@ -134,6 +134,7 @@
 "remember" => "zapamätať",
 "Log in" => "Prihlásiť sa",
 "Alternative Logins" => "Alternatívne prihlasovanie",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>Cheers!" => "Ahoj,<br><br>chcem Vám oznámiť, že %s s Vami zdieľa %s.\nPozrieť si to môžete tu: <br><a href=\"%s\">zde</a>.<br><br>Vďaka",
 "prev" => "späť",
 "next" => "ďalej",
 "Updating ownCloud to version %s, this may take a while." => "Aktualizujem ownCloud na verziu %s, môže to chvíľu trvať."
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index a433aa2cc4ec8d1fcc810d8244d588c86c12b883..3b539f7fe22a5b294812b3957066443a2427c7ff 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 40562add933e72af656cf1b96feb62fdc3ed94e1..f5d7d9337682a7b06d125cc8b26286ccfa5e32d9 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 49664f19f34b6324559b658e986e2eb2243c9db0..a85e1bfb7e1104ff4bf449e9dbe4f8cd123fd149 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 d4154678b65c3a7286d59f1be73d13191d7a532e..492af2cff3e73a6159914a99e5899669025075a7 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",
@@ -46,6 +43,7 @@
 "years ago" => "Ã¥r sedan",
 "Choose" => "Välj",
 "Cancel" => "Avbryt",
+"Error loading file picker template" => "Fel vid inläsning av filväljarens mall",
 "Yes" => "Ja",
 "No" => "Nej",
 "Ok" => "Ok",
@@ -85,11 +83,14 @@
 "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",
+"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",
@@ -102,6 +103,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",
@@ -122,7 +125,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.",
 "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!",
@@ -131,6 +134,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 b67f5e967ece8c2a8da9be5d5c459dad0adbb2e2..0770805ddf55a5e2671002cc51299319baf1b57a 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 66f5629b93309c2085c4eb680ec22ee865594500..83642ed89cbc5fb1176d2d3fa71e537a0b7d1221 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 47574a012590f34a68a870aa308e5bfbdbc03240..f6112040c50f175d5884d9aae1198822515799e0 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",
@@ -46,6 +42,7 @@
 "years ago" => "yıl önce",
 "Choose" => "seç",
 "Cancel" => "Ä°ptal",
+"Error loading file picker template" => "Seçici şablon dosya yüklemesinde hata",
 "Yes" => "Evet",
 "No" => "Hayır",
 "Ok" => "Tamam",
@@ -104,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",
@@ -124,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 65577297c3cc07a4ad7bddf9e799bbf55cd316e4..11ebda3af899423b6b099233f5e7d9a2b3bd51bc 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 cf26212c25e05eccebffaa6f35b43969034b72ed..0e0489bf33d6c918638bb3a9fb427f6bc9c00698 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 3e320ecf800dc2d37f61dde172d57623ded11a9d..ebe6c7006ffded76762a4dc47409de7b3ed1ab4d 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 2e0d0da6f2f9fedc6437fecb8419f83257ed4674..b4cc129964bcf4f9e10085672232d83721345e78 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -1,13 +1,11 @@
 <?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",
 "Object type not provided." => "未选择对象类型。",
+"Error adding %s to favorites." => "在添加 %s 到收藏夹时发生错误。",
 "No categories selected for deletion." => "没有选中要删除的分类。",
+"Error removing %s from favorites." => "在移除收藏夹中的 %s 时发生错误。",
 "Sunday" => "星期天",
 "Monday" => "星期一",
 "Tuesday" => "星期二",
@@ -99,6 +97,7 @@
 "Help" => "帮助",
 "Access forbidden" => "禁止访问",
 "Cloud not found" => "云 没有被找到",
+"web services under your control" => "您控制的网络服务",
 "Edit categories" => "编辑分类",
 "Add" => "添加",
 "Security Warning" => "安全警告",
@@ -118,13 +117,12 @@
 "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!" => "如果您最近没有修改您的密码，那您的帐号可能被攻击了！",
 "Please change your password to secure your account again." => "请修改您的密码以保护账户。",
 "Lost your password?" => "忘记密码?",
-"remember" => "备忘",
+"remember" => "记住登录",
 "Log in" => "登陆",
 "Alternative Logins" => "备选登录",
 "prev" => "后退",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 016a13625692ff3f4d0533e4e8747062553fe79b..29fef5ff220ec306f9a3edee439ad56d4528439b 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 10279c7ba182e4c87b1bdd94b08c62af5eb9a597..306ae7acb8c03ec6bd7bb652fc98ee3266490f22 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",
@@ -93,6 +89,7 @@
 "Request failed!<br>Did you make sure your email/username was right?" => "請求失敗！<br>您確定填入的電子郵件地址或是帳號名稱是正確的嗎？",
 "You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到你的電子郵件信箱。",
 "Username" => "使用者名稱",
+"Yes, I really want to reset my password now" => "對，我現在想要重設我的密碼。",
 "Request reset" => "請求重設",
 "Your password was reset" => "您的密碼已重設",
 "To login page" => "至登入頁面",
@@ -105,6 +102,7 @@
 "Help" => "說明",
 "Access forbidden" => "存取被拒",
 "Cloud not found" => "未發現雲端",
+"web services under your control" => "由您控制的網路服務",
 "Edit categories" => "編輯分類",
 "Add" => "增加",
 "Security Warning" => "安全性警告",
@@ -125,7 +123,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 fbcf4a87f22c876de23c7c7a92338851eca01036..2f9963652190b2f457f912a85c65c017b2b7d5cf 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) {
+		$isEncrypted = OC_App::isEnabled('files_encryption');
 		OC_Template::printGuestPage('core/lostpassword', 'lostpassword',
-			array('error' => $error, 'requested' => $requested));
+			array('error' => $error,
+				'requested' => $requested,
+				'isEncrypted' => $isEncrypted));
 	}
 	
 	protected static function displayResetPasswordPage($success, $args) {
@@ -29,7 +32,16 @@ class OC_Core_LostPassword_Controller {
 	}
 
 	public static function sendEmail($args) {
-		if (OC_User::userExists($_POST['user'])) {
+
+		$isEncrypted = OC_App::isEnabled('files_encryption');
+
+		if(!$isEncrypted || 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 c19c6893f13fe69d61c2b4aa7a7fa808044831bd..f5fdb1fb2b3919fe88943ee8c0fcf40eeeb3d285 100644
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -17,6 +17,12 @@
 				<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 ($_['isEncrypted']): ?>
+				<br /><br />
+				<?php print_unescaped($l->t("Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?")); ?><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 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 0000000000000000000000000000000000000000..37dc8eee94266bd99c178161484b7056a9c525d8
--- /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 336df27ef1c93e00dd0978dae3ffa9893f066bda..163e8e3ae7e6aedcd268aba5a0aebad15394aba0 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 a3a8dc5f7ba0c7dd3013bbec3f18b7edadf7cb5d..4173212dfa3d6cc5ac4c4d1c806571f5b992c927 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" style="display:none;">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 a3ebf3abd0359418af1949b1f84f3c9b85bbc7a6..8c82a5c028e026fc76768a57917db8809a0eb39f 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" style="display:none;">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 0000000000000000000000000000000000000000..ebeefd5c7e82d4538cb6cc05c8f826e056157a94
--- /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 95cedf8bf4c8852bf2f22c01b6474f9cb6267cb8..fbea7f26aed2080e552e817a7df84850a9051f33 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 933b09988f0b77b4cb25c6a5cc048a2e8b05a1e8..cefb7fc52c91c31a6300d966736554936a4707bc 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 bf0b287a64b60064248386a7c9e822bfc68d6b6d..90fd3efcc96e060e5f31875e6b7f12e03791e3f6 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('index', $ex->getMessage(), \OCP\Util::FATAL);
+	OC_Template::printExceptionErrorPage($ex);
+}
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index fec8033bdc44727e1edaf0032aa902594e4c7b5f..41e885396d77b6868864f3fcf3cf3e74583152d9 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-02 02:01+0200\n"
-"PO-Revision-Date: 2013-06-02 00:02+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 00:14+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
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 3ed16041c2edd66c99ad1c09285d9ce51aa3991d..5f308980633c5a8eded90a4694444508e542ace1 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 934d01cdeb964bf4de770e3487498a2ca323a4ed..a87273bc376e51060f9d733247e788a4d05889dc 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-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -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 ae775042a064487da6f2d91704305004304ec799..d0aaba847720839a4d3987b234279fe346c5958f 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-02 02:01+0200\n"
-"PO-Revision-Date: 2013-06-02 00:02+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -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 868778c6d74865626b94207bdeb4d3e4b373f97b..84ae6917bcb19f8163ddec0f40c3ee2ca1c58ef0 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-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr ""
 
@@ -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:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:108
+#: 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 "Wagwoord"
 
-#: templates/personal.php:38
+#: templates/personal.php:41
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:39
+#: templates/personal.php:42
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:40
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:45
 msgid "New password"
 msgstr "Nuwe wagwoord"
 
-#: templates/personal.php:44
+#: templates/personal.php:47
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:56 templates/users.php:81
+#: templates/personal.php:59 templates/users.php:85
 msgid "Display Name"
 msgstr ""
 
-#: templates/personal.php:68
+#: templates/personal.php:74
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:96
+#: 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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "Gebruikersnaam"
+
+#: 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_ldap.po b/l10n/af_ZA/user_ldap.po
index 71d8cea474a0e5de65cc918209db4610f81acfdb..4856d0902bf6cd2ba627d55e0621b176690e5229 100644
--- a/l10n/af_ZA/user_ldap.po
+++ b/l10n/af_ZA/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-06-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/af_ZA/user_webdavauth.po b/l10n/af_ZA/user_webdavauth.po
index 62bfbe01b3489a9901061bd6f44f09e8ea5a8eb0..cf6125d605359a13059b727dbf2340d94364f691 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 495ca68005fc9f4d5c29d6cfd2de9fec70b22edd..cafbf8b0d93ba80dd029f57c3f890f7696261b1c 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -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."
@@ -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 "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud"
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 a52047896fb48b59bf0a53466aac8f3e7566d373..f3cafe7a6e70a14697cb9d99884f397f710f4a71 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -183,35 +183,35 @@ msgstr "عنوان ال URL  لا يجوز أن يكون فارغا."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "إسم مجلد غير صحيح. استخدام مصطلح \"Shared\" محجوز للنظام"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "خطأ"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "اسم"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "حجم"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "معدل"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "مجلد عدد 1"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} مجلدات"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "ملف واحد"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} ملفات"
 
diff --git a/l10n/ar/files_encryption.po b/l10n/ar/files_encryption.po
index bcccd33c2f8d5b21b547bdf635ccda3d6bb84900..808dca2b9d011d53fd6b8554f06da1448082dd19 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "جاري الحفظ..."
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 dc64cac0bb5910126edb6092d45e32768b35933b..6f517e7c90ad1069fb1d9352e8a1b94ca2c57779 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index 58015e50318cec1999dc0f8c3cd244fcc77a5e1e..3f47cdeda063d0b7f459e5a3b5b1b08a835a8134 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -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 50981cac8bd7a817afedf786c0f60633fb2ad72e..1b87c5767986cd103269d60e6fc95a994f084dd2 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index 368f6ff254a8e6d43ba32e5c0b8090921fd638cd..5d21c869ed6bb9ea679f5dbe5a95402785aee8aa 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 90cafbceddef8f13aa4e774902a92d15c85c0415..f19133fabb08a77dba3829525a55bd3629e847e1 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -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
 msgid "Login Name"
 msgstr "اسم الدخول"
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "إسم المستخدم"
+
+#: 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 725f5ca966b0256b7995feea6d35029d09fa45b7..12b60c3972814c0f758f7831ca9183451c94e009 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ar/user_webdavauth.po b/l10n/ar/user_webdavauth.po
index 0b90ad151d9abf0c539f9823bb6406410388df33..fccc6ae2c32882e584b04029f675e74c16a2cd51 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 5a28e4f3e46ce96c6068f2f84258717738fc6742..0ea77a53fe4d11b4b0691aacd791c520e3d3c03c 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-20 02:37+0200\n"
+"PO-Revision-Date: 2013-06-20 00:37+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 c0d6dac572734db49621847364b48ce13035d64b..05e149d6b6bafd7ce3ad797137ee1cc36b56bc00 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 b09ac51eb4d5ff5be8d7efed33cdb95afb3b0f03..ffe52589b393cd3996506722519335f48a673dd3 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 77d13b3886cdab4bdb687eb6473ec2ad1c8ddae5..09f57fe7f721829d97557eec47e96c059f6f68d1 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-20 02:37+0200\n"
+"PO-Revision-Date: 2013-06-20 00:37+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr ""
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr ""
 
@@ -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:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:108
+#: 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:68
+#: templates/personal.php:74
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:96
+#: 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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr ""
+
+#: 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 21fb9c8c465f18c49afc00d9d75be30dd9a25d62..34e6bd83127472da1d0b7d72174d60ae8bd2a053 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 4db3754c97f85ccc83fe085b4465c662b7ca2583..df6f19e4e53d3e30c9e3ac1c58a4c07bc30010a0 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 4febe1372485d7d6b61f2ec979782da4030aced3..00812512505a6f636af501ac2b32e1138d9656a2 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -183,35 +183,35 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Грешка"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Променено"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} папки"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} файла"
 
diff --git a/l10n/bg_BG/files_encryption.po b/l10n/bg_BG/files_encryption.po
index 9bc2e0ee7a6ff8071d76a62b326d241e80e88138..0813860d823e6344042a8e93cbf6f7ca0dddd263 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Записване..."
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 005f4be9ca7b2608dfa194f070838909ba5241fb..40ddac8dbddca209204d37538fe0c8fc1fac043f 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index ea49f21419f1661c0b58f382b2345248708778dc..f024808d5a6e2ed31b45cd597d5ff03865f88cd8 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -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 e391b181a0693d300054824a763c768fbc49df53..63b2b436ea8bacd5ac6d37546a0528569de33e9d 100644
--- a/l10n/bg_BG/files_trashbin.po
+++ b/l10n/bg_BG/files_trashbin.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Димитър Кръстев <dimitar.t.krastev@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +21,7 @@ msgstr ""
 #: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr "Невъзможно изтриване на %s завинаги"
+msgstr "Невъзможно перманентното изтриване на %s"
 
 #: ajax/undelete.php:42
 #, php-format
diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po
index e2c560a53fb982a08731dcc758eed19646521c7f..e195eb4ba19dee897c9894cc2f83ba02d2d60e11 100644
--- a/l10n/bg_BG/lib.po
+++ b/l10n/bg_BG/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Димитър Кръстев <dimitar.t.krastev@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,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 "Админ"
 
@@ -111,78 +112,78 @@ msgstr "%s, не можете да ползвате точки в името н
 #: setup.php:64
 #, php-format
 msgid "%s set the database host."
-msgstr ""
+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 ""
+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 ""
+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 ""
+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 ""
+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 f02923ceabc09f8f017fa52ecc8f31fc21da2d8c..eb25bb664848f3ae3de83d04f18153e9efccbe8a 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -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 "Изтриване"
 
@@ -190,7 +190,7 @@ msgstr ""
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Вашият web сървър все още не е удачно настроен да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи."
 
 #: templates/admin.php:33
 #, php-format
@@ -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
 msgid "Login Name"
 msgstr "Потребител"
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "Потребител"
+
+#: 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 af255ba0488a9d9276653639425526733e23a1ce..e500fe54fd735d6fdcfd5bb20ca23d2c70fcd338 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/bg_BG/user_webdavauth.po b/l10n/bg_BG/user_webdavauth.po
index fb9b137fdff7ba10148fcff38482b527380eb6ec..3b2e883a6182bfb876ad861d9484c07489b1f5a6 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 cbe7b2ab1e2246126c83baa7301c8b0146c1e56d..0a3a474d3e26b9fb4427608720b28e0d6029b573 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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."
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 2b55e51fc89ca1af222d5dfdb5b99071550f1b11..81d1cf99871510adde053ff045a64c1859f3b25c 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr "URL ফাঁকা রাখা যাবে না।"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ফোল্ডারের নামটি সঠিক নয়। 'ভাগাভাগি করা' শুধুমাত্র Owncloud  এর জন্য সংরক্ষিত।"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "সমস্যা"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "রাম"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "আকার"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "পরিবর্তিত"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "১টি ফোল্ডার"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} টি ফোল্ডার"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "১টি ফাইল"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} টি ফাইল"
 
diff --git a/l10n/bn_BD/files_encryption.po b/l10n/bn_BD/files_encryption.po
index 3b9c0439d515a0c84af43d52a7b08fab2aa03d65..0c3bb3a2c7f1f6eea041e2f8f40ebd89bec784e9 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "সংরক্ষণ করা হচ্ছে.."
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 cfb952a4853baf763d33ebcd639ff0bdb4fa22dd..25bef73f5e7fe8f2e379a3d7e02be071a985b392 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 982c0e344354782414d77e95a76b727c562b84d8..0b17a43cbaf6856cc4b9ec243ed704cfc2dabe9b 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 322ba4bd5ffeb65c6ee00f6ac97fe421f09347e4..b7d203caa12868dbd9e7d123a7daf9c47723b36c 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 43fe032b8ffed014fb02260cb0f6c28bfa43fe2e..78a9b05024a083c124ac69bfd9fb978809107fae 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 b07fc191521d993aa69b063a3f86bbe597d8206c..bf61fd2004b42be16ee70117a38730cc7195d785 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "ব্যবহারকারী"
+
+#: 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 1613ef51b97919b33b039781dd2b196e7e8c64a9..b934bec3990d2ef4e03b9a04e0c1b579ef596e95 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 1768f6474f044b017003815604eeffd9bc32bcfe..c4bf197ff78e71d3096daf2bef1c49fef5c1c913 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 0000000000000000000000000000000000000000..a56fe6475db02cb70bc477391e26b9d02fe0a4e6
--- /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-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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:60
+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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
+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 0000000000000000000000000000000000000000..bc87fa7673a420eec92820e7df1f613090b7fd66
--- /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-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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:840 js/files.js:878
+msgid "Error"
+msgstr ""
+
+#: js/files.js:891 templates/index.php:69
+msgid "Name"
+msgstr "Ime"
+
+#: js/files.js:892 templates/index.php:80
+msgid "Size"
+msgstr "Veličina"
+
+#: js/files.js:893 templates/index.php:82
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:912
+msgid "1 folder"
+msgstr ""
+
+#: js/files.js:914
+msgid "{count} folders"
+msgstr ""
+
+#: js/files.js:922
+msgid "1 file"
+msgstr ""
+
+#: js/files.js:924
+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 0000000000000000000000000000000000000000..f02219a71d82579f28a267aeb287fc44e0db685a
--- /dev/null
+++ b/l10n/bs/files_encryption.po
@@ -0,0 +1,170 @@
+# 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
+#: js/settings-admin.js:11
+msgid "Saving..."
+msgstr "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 recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:14
+msgid "Recovery key 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 recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 0000000000000000000000000000000000000000..631ae608bafdead31aac56781e781d456d304ecb
--- /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 0000000000000000000000000000000000000000..97a30ec7e14eb26d356da1bc077b99236095bd81
--- /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 0000000000000000000000000000000000000000..baa1264b2f42288e7dcbd9f2e57413b144c57c4b
--- /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-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 0000000000000000000000000000000000000000..221060a5ffda7a75fbcf48b5dd34e0d727ebde4b
--- /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 0000000000000000000000000000000000000000..91bc2323395d5af397df28623d7f8c9f1ad8b441
--- /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 0000000000000000000000000000000000000000..6aed06182f3d733800099e514986b88dbf9a8834
--- /dev/null
+++ b/l10n/bs/settings.po
@@ -0,0 +1,506 @@
+# 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-20 02:37+0200\n"
+"PO-Revision-Date: 2013-06-20 00:37+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Language-Team: 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
+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:84
+msgid "Username"
+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 0000000000000000000000000000000000000000..2d85a9f6eb8ccb7ef8530ce25461055ed4b53932
--- /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 0000000000000000000000000000000000000000..93f72af76555c0451884fa9c2d65ae81ee00a835
--- /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 4ac35149cdec7184c67604dc52442b1f3a88ba08..74b3246d057e66eac88c3b93ee890cf579deb4b0 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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."
@@ -218,23 +199,23 @@ msgstr "anys enrere"
 msgid "Choose"
 msgstr "Escull"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: 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 "Error en carregar la plantilla del seleccionador de fitxers"
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Sí"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "D'acord"
 
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. Si sabeu què fer, contacteu amb l'administrador abans de continuar. Voleu continuar?"
+
+#: 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:27
 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 436ee3aec70488bccd42565df5c6a5f61237086f..3848fb765d17a6d674c42a81d2c194dac38d3237 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+0000\n"
 "Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -184,35 +184,35 @@ msgstr "La URL no pot ser buida"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nom de carpeta no vàlid. L'ús de 'Shared' està reservat per Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Error"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Mida"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} carpetes"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 fitxer"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} fitxers"
 
diff --git a/l10n/ca/files_encryption.po b/l10n/ca/files_encryption.po
index 10fc22da5c65d5599056d6e8c0f91a22f4097b8b..6299819d071800ae3ca8cf256a5a6e7134f8cabd 100644
--- a/l10n/ca/files_encryption.po
+++ b/l10n/ca/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# rogerc, 2013
 # Jordi Vilalta Prat <jvprat@jvprat.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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -20,85 +21,152 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "La clau de recuperació s'ha activat"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "No s'ha pogut activar la clau de recuperació. Comproveu contrasenya de la clau de recuperació!"
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "La clau de recuperació s'ha descativat"
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "No s'ha pogut desactivar la calu de recuperació. Comproveu la contrasenya de la clau de recuperació!"
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
-msgstr ""
+msgstr "La contrasenya s'ha canviat."
 
 #: ajax/changeRecoveryPassword.php:51
 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"
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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 ""
+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 ""
+msgstr "Desactivat"
 
-#: templates/settings-admin.php:32
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 ""
+msgstr "Canvia la contrasenya"
 
 #: 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 ""
+"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 ""
+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 ""
+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 db9e5dfb76020c37682f7939674aed3cd0c9b652..380d2ad0e62781d190a33c56d08399b5115b47ed 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 4ba839ce6a2250a6a94bcfb454c66204be5253ec..32b91213c24d8fdf3bdc5c3caca67111cb45f97e 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 ce490a2e470dfff3ea853ba4d189e3e2750e72bd..f4c82a2a13cbc1c9624e2c0366bba30c9cec54e9 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 faff0c767bf54d6d8ee26fa65b1dcd8fdce641c2..21e1e2b42bdfd762e5d9ced0e4582b487efee46f 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 032f43b74c722a7e7c0823c1db3a8fea667cb0f8..f3d1dacbdb860b2bbed6e6e8ed5d6c7f9e583fab 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr "Nom d'accés"
 
@@ -465,34 +465,44 @@ 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:84
+msgid "Username"
+msgstr "Nom d'usuari"
+
+#: 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 cb56954f9f0d6dc3cbc77b7f489d72de663333ea..095ed8b87236a9b0d7d8c6424132da00c7d8d6da 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 66136ea54afafc078361f1b4b567285892403b28..ca202c2dd7979730659f1d48c177356948007717 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 19d8824d33f4a9912c59bbe8e8ec85e5a3589a79..f914ae469470dbacb5b519065cfb856d3a7663f5 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Honza K. <honza889@gmail.com>, 2013
 # Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
 "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 "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."
@@ -217,23 +199,23 @@ msgstr "před lety"
 msgid "Choose"
 msgstr "Vybrat"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: 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 ""
+msgstr "Chyba při načítání šablony výběru souborů"
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Ano"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Ne"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -393,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:60
 msgid "ownCloud password reset"
 msgstr "Obnovení hesla pro ownCloud"
 
@@ -421,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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "Ano, opravdu si nyní přeji obnovit své heslo"
+
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Vyžádat obnovu"
 
@@ -469,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"
@@ -561,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"
 
@@ -604,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 1212b63feb12a19ee24f36fdba060af89dcf3a6a..8e82ebd7f83f2bb8cb62e5247d8f7919a069f984 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Honza K. <honza889@gmail.com>, 2013
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -183,41 +185,41 @@ msgstr "URL nemůže být prázdná"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Neplatný název složky. Použití 'Shared' je rezervováno pro vnitřní potřeby Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Chyba"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Název"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Upraveno"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 složka"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} složky"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 soubor"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} soubory"
 
 #: lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Název složky nelze použít. Použití názvu 'Shared' je ownCloudem rezervováno"
 
 #: lib/app.php:73
 msgid "Unable to rename file"
diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po
index 6c2fa91ab96e4054cee70e3f48fb9194dbe6b335..bb6f6dbaa645de78f37406b474b39032bec30bae 100644
--- a/l10n/cs_CZ/files_encryption.po
+++ b/l10n/cs_CZ/files_encryption.po
@@ -3,12 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Honza K. <honza889@gmail.com>, 2013
+# Tomáš Chvátal <tomas.chvatal@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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -19,85 +21,152 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Záchranný klíč byl úspěšně povolen"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Nepodařilo se povolit záchranný klíč. Zkontrolujte prosím vaše heslo záchranného klíče!"
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Záchranný klíč byl úspěšně zakázán"
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo vašeho záchranného klíče."
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Heslo bylo úspěšně změněno."
 
 #: ajax/changeRecoveryPassword.php:51
 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"
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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 ""
+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 ""
+msgstr "Zakázáno"
 
-#: templates/settings-admin.php:32
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
+msgstr "Změnit heslo"
+
+#: 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 ""
-"Enabling this option will allow you to reobtain access to your encrypted "
-"files if your password is lost"
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
 msgstr ""
 
-#: templates/settings-personal.php:27
-msgid "File recovery settings updated"
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
 msgstr ""
 
-#: templates/settings-personal.php:28
-msgid "Could not update file recovery"
+#: 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 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:63
+msgid "File recovery settings updated"
+msgstr "Možnosti obnovy souborů aktualizovány"
+
+#: 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 993ed7edf8e0be98b4ddaab5668921566351db8f..e3716085af222963ee1b32f8b01ad74444c8f5a2 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 1f16d54c480bec97cc1ded57bbb1bdbaa1626e7a..7ca1084cbabf8a3a5128906bb59a109008d67923 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 c4dd41f482cc386dcaf1f2240b3e901271729762..4c929a0feb4dd071638d02c80ae51de783249230 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 7c0d67efd91b9011cdddc8704d03078742f2391b..9ce3a578284ab5f74e934527ed39c39e2480dddf 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,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"
 
@@ -113,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 ""
+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 d0e6d27677637a41b37d3f005eeae4a08d586cf9..e20ff07ce6f6d2a3e76466ad79f00403887435c3 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -58,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"
 
@@ -136,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"
 
@@ -324,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 "
@@ -338,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"
 
@@ -386,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
 msgid "Login Name"
 msgstr "Přihlašovací jméno"
 
@@ -463,34 +464,44 @@ msgstr "Přihlašovací jméno"
 msgid "Create"
 msgstr "Vytvořit"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
-msgstr ""
+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:84
+msgid "Username"
+msgstr "Uživatelské jméno"
+
+#: 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 9591f0e61112e46ada0f6acf107cb1ca80f8b4d0..9c2f882ee6fe5b60fbf2ba7a34cf01c21217df31 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Honza K. <honza889@gmail.com>, 2013
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +21,7 @@ msgstr ""
 
 #: ajax/clearMappings.php:34
 msgid "Failed to clear the mappings."
-msgstr ""
+msgstr "Selhalo zrušení mapování."
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
@@ -59,7 +61,7 @@ msgstr "Nelze přidat nastavení serveru"
 
 #: js/settings.js:111
 msgid "mappings cleared"
-msgstr ""
+msgstr "mapování zrušeno"
 
 #: js/settings.js:112
 msgid "Success"
@@ -342,7 +344,7 @@ msgstr "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte L
 
 #: templates/settings.php:101
 msgid "Internal Username"
-msgstr ""
+msgstr "Interní uživatelské jméno"
 
 #: templates/settings.php:102
 msgid ""
@@ -362,11 +364,11 @@ msgstr ""
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
-msgstr ""
+msgstr "Atribut interního uživatelského jména:"
 
 #: templates/settings.php:104
 msgid "Override UUID detection"
-msgstr ""
+msgstr "Nastavit ručně UUID atribut"
 
 #: templates/settings.php:105
 msgid ""
@@ -381,11 +383,11 @@ msgstr ""
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
-msgstr ""
+msgstr "Atribut UUID:"
 
 #: templates/settings.php:107
 msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "Mapování uživatelských jmen z LDAPu"
 
 #: templates/settings.php:108
 msgid ""
@@ -404,11 +406,11 @@ msgstr ""
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "Zrušit mapování uživatelských jmen LDAPu"
 
 #: templates/settings.php:109
 msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "Zrušit mapování názvů skupin LDAPu"
 
 #: templates/settings.php:111
 msgid "Test Configuration"
diff --git a/l10n/cs_CZ/user_webdavauth.po b/l10n/cs_CZ/user_webdavauth.po
index 420758436b0489b07961ab1da1aa04aa0714c8a9..6cbaabde3fc067a7ea9a414897e68c37919b5a80 100644
--- a/l10n/cs_CZ/user_webdavauth.po
+++ b/l10n/cs_CZ/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: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-18 02:04+0200\n"
+"PO-Revision-Date: 2013-06-17 17:20+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"
 "Content-Type: text/plain; charset=UTF-8\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 "URL: "
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index e8b891b6f5ffacc1cce182a995b96ecedeb19ad6..2fdd1c363352d8455b62179075d615409c29b302 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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."
@@ -217,23 +198,23 @@ msgstr "blwyddyn yn ôl"
 msgid "Choose"
 msgstr "Dewisiwch"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: 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 "Ie"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Na"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Iawn"
 
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 a04bf66d91c863f14644d43bc65148be4f59c0a2..901b02108957aa1d43658480ce4d01e5d28a7444 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr "Does dim hawl cael URL gwag."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Enw plygell annilys. Mae'r defnydd o 'Shared' yn cael ei gadw gan Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Gwall"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Enw"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Maint"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Addaswyd"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 blygell"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} plygell"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 ffeil"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} ffeil"
 
diff --git a/l10n/cy_GB/files_encryption.po b/l10n/cy_GB/files_encryption.po
index 7cd6f45cb5fa090c9dbd80692c2598d435ff91fa..fd306ca46dae5b94ea1bd810196414fd598bf7fa 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -44,61 +44,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 78d44d150464823517112c5f9774a38f512de07c..4d2a2eae5c0de9897cda3ed9c1aafacb0257f171 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 16f9054a7bf42f52950962c31ad6d4f080aaf1c0..0a57a9cde569b1bf56af9b2f5d44098d127538b8 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
-"Last-Translator: ubuntucymraeg <owen.llywelyn@gmail.com>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 b1fbd8c2afe3c8690606789b2083a9ccfca700be..5788c4b356c580201bf6a0b71092665852bc10e3 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 2c1e0f4aa05ed06bbc02cded7d6d040fac4a1a87..d36b3089295533b5b94342b8c296b820ec764260 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 785015e3e9e4443be164072a331d8cf32f7d84b0..8c3ebe3174055e82cd87402317b30d7d99d4734d 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "Enw defnyddiwr"
+
+#: 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 99ba7c568e3e23f610337a11620a3cff32bf9ab0..0cafa6fa3fed4caf2559d0b9a50531313bac4c6b 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 2f567efac8ec3b063b347c56e0cc657110c47dc7..d034799f1886f2fc77fb41d7f5f6f4917f67769c 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 2f425479b50e2a216add7f48c403552f7af56443..ee143650862c3797fd911a91a054656b4023560b 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -3,12 +3,14 @@
 # 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -19,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."
@@ -216,23 +199,23 @@ msgstr "Ã¥r siden"
 msgid "Choose"
 msgstr "Vælg"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Annuller"
 
-#: 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 ""
+msgstr "Fejl ved indlæsning af filvælger skabelon"
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Nej"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "OK"
 
@@ -392,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:60
 msgid "ownCloud password reset"
 msgstr "Nulstil ownCloud kodeord"
 
@@ -405,11 +388,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 "Linket til at nulstille dit kodeord er blevet sendt til din e-post. <br> Hvis du ikke modtager den inden for en rimelig tid, så tjek dine spam / junk mapper.<br> Hvis det ikke er der, så spørg din lokale administrator."
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "Anmodning mislykkedes!<br>Er du sikker på at din e-post / brugernavn var korrekt?"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
@@ -420,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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Anmod om nulstilling"
 
@@ -468,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"
@@ -560,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 ""
+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"
 
@@ -603,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 80a65611032b682437b0c68c64ab54ffca617ee4..14ec9de66989ee06cf8ded90f8c722863341c879 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,41 +184,41 @@ msgstr "URLen kan ikke være tom."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Fejl"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Ændret"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 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 49b772ef5d44c43b58f78a129e297e0ce59aba81..c43e22e5d267b6c7e3d5659b529cf1e8ee561f65 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 4ca39b66c4fae08cd5961c8e418d39c43240a16b..360b6a00758c4fa584803f864538383cc7e1180c 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 124f03c1e50b3f249ea7610c274ff4d460e4fa30..63aa4bc17372cb4ea1febb3638cb730a3b64a22b 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 2fbadf71c60be9f42de14d6900e8372b0d8f7421..c0a227946da87063c6d49a79d57768c79c111932 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 18172dd9f40188bb0bd1959c16062ddce0bda3e7..3e77cbaf0d0cbc15e326d1e5655b319671084fb2 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 7dcf4dca63eb0c83bd33e52b0bf971cd579f3f72..d95f5c114dc892ca2d08db9a6da7d775c5e49cfd 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
@@ -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
 msgid "Login Name"
 msgstr "Loginnavn"
 
@@ -464,34 +464,44 @@ 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:84
+msgid "Username"
+msgstr "Brugernavn"
+
+#: 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 f2c20cdc87e5253008f231c6e0dc3588c0a76179..e6f5ed9d780f881f9ac2ad6b14046d9b0de41277 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 9c0bc594ab88a033d8fb326eabded596bb9b7167..5a46dae8fe24a6318877dcb9a772d7f9b53cf48c 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 d4327a141990275dfb1456941beb40d411270e73..3329cb8d3ff558e77009c97bfee8ca4444e1bc97 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -5,14 +5,15 @@
 # Translators:
 # arkascha <foss@christian-reiner.info>, 2013
 # Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# ninov <ninovdl@ymail.com>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -22,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."
@@ -219,23 +201,23 @@ msgstr "Vor Jahren"
 msgid "Choose"
 msgstr "Auswählen"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: 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 ""
+msgstr "Dateiauswahltemplate konnte nicht geladen werden"
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Nein"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "OK"
 
@@ -395,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:60
 msgid "ownCloud password reset"
 msgstr "ownCloud-Passwort zurücksetzen"
 
@@ -423,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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Beantrage Zurücksetzung"
 
@@ -471,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"
@@ -563,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"
 
@@ -606,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 8aa114e960f447842cc8f4a4cc3a8ba7d6615883..ee99969b612950bb39c4c0f759aa7ce97dddf4b8 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# ninov <ninovdl@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+0000\n"
+"Last-Translator: ninov <ninovdl@ymail.com>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -184,41 +185,41 @@ msgstr "Die URL darf nicht leer sein."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Fehler"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Geändert"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} Dateien"
 
 #: lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Der Ordnername ist ungültig. Nur ownCloud kann den Ordner \"Shared\" anlegen"
 
 #: lib/app.php:73
 msgid "Unable to rename file"
diff --git a/l10n/de/files_encryption.po b/l10n/de/files_encryption.po
index 59cfb0e8e2cc0f0636ae728e32b6b42b74efcb18..a7df9e531643ac5876fec0011bf26c84f6c809d5 100644
--- a/l10n/de/files_encryption.po
+++ b/l10n/de/files_encryption.po
@@ -3,12 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# iLennart21 <a12s34d56f78@live.com>, 2013
+# Stephan Köninger <mail@stekoe.de>, 2013
+# ninov <ninovdl@ymail.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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,85 +22,152 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Wiederherstellungsschlüssel wurde erfolgreich aktiviert"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Überprüfen Sie Ihr Wiederherstellungspasswort!"
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Wiederherstellungsschlüssel deaktiviert."
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Überprüfen Sie Ihr Wiederherstellungspasswort!"
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Dein Passwort wurde geändert."
 
 #: ajax/changeRecoveryPassword.php:51
 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 "Passwort des privaten Schlüssels erfolgreich aktualisiert"
+
+#: 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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 "Private Einstellungen"
+
 #: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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 ""
+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 ""
+msgstr "Deaktiviert"
 
-#: templates/settings-admin.php:32
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
+msgstr "Passwort ändern"
+
+#: 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 "Altes login Passwort"
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr "Aktuelles Passwort"
+
+#: 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 "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 7afea52f30a13bc6f7c1c25088276baa4608efe7..36c2eaf3742fde5fa2609c8ae6f7a20d505b70c4 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 e3c784db44c9a2120cc33df06ca2c464e2d1e8ba..47a0b7c931be1fee9da1da2f562d0fee315b8b0a 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 a2431575c2973b2580bf0cbf327959e3266c9681..0febaa69c380c84650ae2bbee24d6a4a2723b956 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 e352851bf54884e3eaddaf2cb8c9cc88978d8056..8694bc304504b38e398b4eac0596213be2c9ca6a 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# ninov <ninovdl@ymail.com>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+0000\n"
+"Last-Translator: ninov <ninovdl@ymail.com>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,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"
 
@@ -114,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 ""
+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 20d97d2d8462d2fced897dc1e371a0d11e3e8343..b193c6a20d726b6744a432b07bbcf76f66cc7be1 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -4,13 +4,15 @@
 # 
 # Translators:
 # arkascha <foss@christian-reiner.info>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
+# ninov <ninovdl@ymail.com>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -60,7 +62,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"
 
@@ -138,16 +140,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"
 
@@ -326,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 "
@@ -340,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ü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"
 
@@ -388,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 "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
 msgid "Login Name"
 msgstr "Loginname"
 
@@ -465,34 +467,44 @@ msgstr "Loginname"
 msgid "Create"
 msgstr "Anlegen"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
-msgstr ""
+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 "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen"
+
+#: 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:84
+msgid "Username"
+msgstr "Benutzername"
+
+#: 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 9b62916ffc4b4c96d773fdd9b7c5a2d663c25f2d..81d2d4aaa219c1b245472f46a812c0b9fb8cf69b 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 ff18551f627ecdcba47acd28a550ce98116d75a9..47b68e0fd1ff51182bed5b720dcef41541092eaf 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 3ef98330906633c583e6c263734698030914de18..b3b252cecb7dfcd04109ba18609af100cf2caa31 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -5,15 +5,16 @@
 # Translators:
 # arkascha <foss@christian-reiner.info>, 2013
 # Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
 # traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\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 "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 "%s geteilt »%s« mit Ihnen"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -220,23 +202,23 @@ msgstr "Vor Jahren"
 msgid "Choose"
 msgstr "Auswählen"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: 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 "Es ist ein Fehler in der Vorlage des Datei-Auswählers aufgetreten."
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Nein"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "OK"
 
@@ -396,7 +378,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:60
 msgid "ownCloud password reset"
 msgstr "ownCloud-Passwort zurücksetzen"
 
@@ -424,7 +406,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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keinen Weg geben, um Ihre Daten wieder zu bekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?"
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen."
+
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Zurücksetzung anfordern"
 
@@ -472,6 +466,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 "Hallo,\n\nich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.\nSchauen Sie es sich an: %s\n\nViele Grüße!"
+
+#: 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 +573,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 +612,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 "Hallo,<br><br>ich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.<br><a href=\"%s\">Schauen Sie es sich an!</a><br><br>Viele Grüße!"
+
 #: 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 2dd5d0dd85239f9e8aeadf7de064a8095f6e59f8..d1dd4477eb4a88abd41eb8ee177f0bce7a8256f1 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+0000\n"
 "Last-Translator: a.tangemann <a.tangemann@web.de>\n"
 "Language-Team: German (Germany) <translations@owncloud.org>\n"
 "MIME-Version: 1.0\n"
@@ -186,35 +186,35 @@ msgstr "Die URL darf nicht leer sein."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ungültiger Verzeichnisname. Die Nutzung von \"Shared\" ist ownCloud vorbehalten"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Fehler"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Geändert"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} Dateien"
 
diff --git a/l10n/de_DE/files_encryption.po b/l10n/de_DE/files_encryption.po
index c01a4a7f13ada33bb756e92db8f18df0068fcd31..6440ed6d3adf3c152f6f55ee8ee4aa5cd656e55d 100644
--- a/l10n/de_DE/files_encryption.po
+++ b/l10n/de_DE/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# ako84 <a0306265@unet.univie.ac.at>, 2013
 # traductor <transifex-2.7.mensaje@spamgourmet.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 22:00+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 13:00+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"
@@ -44,61 +45,128 @@ 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 "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert."
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig."
+
+#: 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr "Das PHP-Modul OpenSSL ist nicht installiert."
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr "Bitte fragen Sie Ihren Server-Administrator, das entsprechende Modul zu installieren. Bis dahin wurde die Anwendung zur Verschlüsselung deaktiviert."
+
 #: 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 "Ihr privater Schlüssel ist ungültig! Vielleicht wurde Ihr Passwort von außerhalb geändert."
+
+#: 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 "Persönliche Einstellungen"
+
 #: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
-msgstr "Account-Passwort wiederherstellen"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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 "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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
-msgstr "Altes Passwort für die Account-Wiederherstellung"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
+msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
-msgstr "Neues Passwort für die Account-Wiederherstellung"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen."
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr "Altes Login-Passwort"
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr "Momentanes Login-Passwort"
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr "Das Passwort des privaten Schlüssels aktualisieren"
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr "Passwort-Wiederherstellung aktivieren:"
+
+#: 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 61ef1e033dcf6ccfc246e455c295bed283b0bbf5..36c187ac1f224269db6cc751dde7d9b4cd909e16 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 ddeb20030d3a1b1fb160afcfe584f9b92d1e247d..10fc41ca5d1955e62eb67f8873c7de92e189e1cd 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 ed2b66d7e9e634f68d8c19be2a417d0dea1de33e..af00f22b582526edecc4b77158a22657af73c3e7 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 e13631a95ea8060ef3f68bbde20363cfbbe2b516..d150c9ea1f2f7b0345c598ea9cb1a78b1a3d3065 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 bdca0febe3a23cd568af93b7badb4c1aab3eaef3..518f1aa7485e6669ce074372eb9905da45ef5d9c 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -5,15 +5,16 @@
 # Translators:
 # a.tangemann <a.tangemann@web.de>, 2013
 # arkascha <foss@christian-reiner.info>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013
 # traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: traductor <transifex-2.7.mensaje@spamgourmet.com>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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 +63,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 +141,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 +329,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 +343,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 +391,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
 msgid "Login Name"
 msgstr "Loginname"
 
@@ -467,34 +468,44 @@ 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 "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen"
+
+#: 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:84
+msgid "Username"
+msgstr "Benutzername"
+
+#: 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 39f12159ddde17493d79f96d54195b22b5471a99..393a83e49f5820d9dbc1d7d0f77adb88ccbab589 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 44670121a4ede3a026c0bd129edaca449cb756a4..41721aaee38cf85d3b181abc1758840a334f76e5 100644
--- a/l10n/de_DE/user_webdavauth.po
+++ b/l10n/de_DE/user_webdavauth.po
@@ -12,9 +12,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-20 02:37+0200\n"
+"PO-Revision-Date: 2013-06-18 20:40+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,8 +27,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV-Authentifizierung"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr "URL:"
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 7e9f3d98d4c1daba283068cf7f01db803552ff4e..7522d7cf10c165def52f5c6df96bc02c10860987 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -3,15 +3,20 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
+# KAT.RAT12 <spanish.katerina@gmail.com>, 2013
+# Teogramm <theodorewii121@hotmail.com>, 2013
+# Teogramm <theodorewii121@hotmail.com>, 2013
+# Wasilis <inactive+Wasilis@transifex.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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,27 +26,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."
@@ -218,23 +204,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 "Οκ"
 
@@ -394,7 +380,7 @@ msgstr "Η ενημέρωση ήταν ανεπιτυχής. Παρακαλώ σ
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "Επαναφορά συνθηματικού ownCloud"
 
@@ -422,7 +408,19 @@ msgstr "Θα λάβετε ένα σύνδεσμο για να επαναφέρε
 msgid "Username"
 msgstr "Όνομα χρήστη"
 
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:22
+msgid ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί ανάκτησης, δεν υπάρχει περίπτωση να έχετε πρόσβαση στα δεδομένα σας μετά την επαναφορά του συνθηματικού. Εάν δεν είστε σίγουροι τι να κάνετε, παρακαλώ επικοινωνήστε με τον διαχειριστή πριν συνεχίσετε. Θέλετε να συνεχίσετε;"
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "Ναι, θέλω να επαναφέρω το συνθηματικό μου τώρα."
+
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Επαναφορά αίτησης"
 
@@ -470,6 +468,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 "Επεξεργασία κατηγοριών"
@@ -562,16 +575,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 +614,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/el/files.po b/l10n/el/files.po
index 7ab2df8363019703d7c4e1a8d51ffa3c50f5b9f1..b6072df48b88cb7dc2fd3e80cca1e0da734c060e 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -184,35 +184,35 @@ msgstr "Η URL δεν μπορεί να είναι κενή."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Μη έγκυρο όνομα φακέλου. Η χρήση του 'Κοινόχρηστος' χρησιμοποιείται από ο Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Όνομα"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Τροποποιήθηκε"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 φάκελος"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} φάκελοι"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 αρχείο"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} αρχεία"
 
diff --git a/l10n/el/files_encryption.po b/l10n/el/files_encryption.po
index d5c014762f255de183c42ea7be5c4b07df75eff8..2f09202bc3a1ce4fe64afa9ff8475f0fdcb5f9a3 100644
--- a/l10n/el/files_encryption.po
+++ b/l10n/el/files_encryption.po
@@ -3,13 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
+# Teogramm <theodorewii121@hotmail.com>, 2013
+# 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"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-25 02:04+0200\n"
+"PO-Revision-Date: 2013-06-24 20:50+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,67 +40,134 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Γίνεται αποθήκευση..."
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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 ""
+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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 fc7d4ed7cce144318b42b8e44a59a8186402454c..b06796c7f855cc331634bdc4db3aa68284ded3a5 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 03675fb211413a572b359f0172d4e87f62695d99..d6cfe458552b73a9a7ed1555daafe29356d16ee5 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 cfdf141df089493bb00fcdcd7d2411af65bfbda7..d15ee15a56b3458995e33f76d6eb9ab461705c45 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 b807ee9ae96de89585ca62392acf8e30744b1bce..6098e170aa9134bde69b5dafd8061366d3bc45ba 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,27 +18,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 +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 ""
+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 "Υπάρχει ήδη ο χρήστης '%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 82c5279ebae341266cf9457d5bf839866118ddb6..f8360c568f853a7f59b15fd37592d5f4d81a8ed5 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -3,14 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
+# KAT.RAT12 <spanish.katerina@gmail.com>, 2013
+# Teogramm <theodorewii121@hotmail.com>, 2013
+# 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,7 +63,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 +141,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 +329,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 +343,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 +391,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
 msgid "Login Name"
 msgstr "Όνομα Σύνδεσης"
 
@@ -464,34 +468,44 @@ msgstr "Όνομα Σύνδεσης"
 msgid "Create"
 msgstr "Δημιουργία"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
-msgstr ""
+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:84
+msgid "Username"
+msgstr "Όνομα χρήστη"
+
+#: 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 fe6c6a8f1c710462ad04068a229ee77babee72a6..d1fbba123f723e72d636d0c2e475bdb3996eaa68 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 3a75e3ceaee1f04c8436901bdcff2572d50dfbe5..cd7f6d89f48834216d75d57f631c49770db2f1a3 100644
--- a/l10n/el/user_webdavauth.po
+++ b/l10n/el/user_webdavauth.po
@@ -5,15 +5,16 @@
 # Translators:
 # Dimitris M. <monopatis@gmail.com>, 2012
 # Efstathios Iosifidis <iefstathios@gmail.com>, 2012
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2013
 # Konstantinos Tzanidis <tzanidis@gmail.com>, 2012
 # Marios Bekatoros <>, 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-25 02:04+0200\n"
+"PO-Revision-Date: 2013-06-24 20:30+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,8 +27,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/en@pirate/core.po b/l10n/en@pirate/core.po
index 63750feeb39d98c95228691c95e7cda1cb7b899e..ba34f38b118a53e1d60abbd432d8feb637dc50dd 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-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10: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"
 "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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 1a2619c71ec223d3f3c1eead9e84033469ad2441..309bf275953c0875e500aaf21d90f4b407f9736e 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23: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"
@@ -183,35 +183,35 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr ""
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/en@pirate/files_encryption.po b/l10n/en@pirate/files_encryption.po
index f27a3729d619264ef721582422ea391daa116379..1d53eae1d1bcbb3d62ae0051b7d31c8e0d06347e 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 f3c697a2c9893845af1ecde83f82c7df7f5f208e..7ceb81b1df60d789e66ae4fea08bc1a6ada2374f 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
-"Last-Translator: lhpalacio <luizhenrique_gomespalacio@hotmail.com>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 2dd26cf0d9d21d81c2968714e6eefb2e08b653d5..248b7b6182b4d08ce2757059759557928655b612 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-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\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:105
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:108
+#: 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 "Passcode"
 
-#: 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:68
+#: templates/personal.php:74
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:96
+#: 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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr ""
+
+#: 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_ldap.po b/l10n/en@pirate/user_ldap.po
index ffa7973ace000da2b7ead4454ea1dc12ff90b9ef..ac3ae9d2a52f2b264f404cd61d6d23655bdb82f0 100644
--- a/l10n/en@pirate/user_ldap.po
+++ b/l10n/en@pirate/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-06-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/en@pirate/user_webdavauth.po b/l10n/en@pirate/user_webdavauth.po
index 055e077694ef7cc666fb06787c763457e5117b78..22b86eac1980e0b5d36f867a9939249a8cbb0cfc 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 b0942d2e860e9ce68ee46596c06da3dda5bf3b5b..38371de9a25d2217e9ef5129c366b348ffcb272b 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Baptiste <baptiste+transifex@darthenay.fr>, 2013
+# Mariano <mstreet@kde.org.ar>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\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"
@@ -19,27 +21,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 "%s kunhavigis “%s” kun vi"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -52,7 +35,7 @@ msgstr "Ĉu neniu kategorio estas aldonota?"
 #: ajax/vcategories/add.php:37
 #, php-format
 msgid "This category already exists: %s"
-msgstr ""
+msgstr "Tiu kategorio jam ekzistas: %s"
 
 #: ajax/vcategories/addToFavorites.php:26 ajax/vcategories/delete.php:27
 #: ajax/vcategories/favorites.php:24
@@ -216,23 +199,23 @@ msgstr "jaroj antaÅ­e"
 msgid "Choose"
 msgstr "Elekti"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Nuligi"
 
-#: 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 "Jes"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Ne"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Akcepti"
 
@@ -259,7 +242,7 @@ msgstr "La necesa dosiero {file} ne instaliĝis!"
 
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
-msgstr ""
+msgstr "Dividita"
 
 #: js/share.js:90
 msgid "Share"
@@ -386,13 +369,13 @@ 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 ""
+msgstr "La ĝisdatigo estis malsukcese. Bonvolu raporti tiun problemon al la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouda komunumo</a>."
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "La pasvorto de ownCloud restariĝis."
 
@@ -409,7 +392,7 @@ msgstr ""
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "La peto malsukcesis!<br />Ĉu vi certiĝis, ke via retpoŝto/uzantonomo ĝustas?"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
@@ -420,7 +403,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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "Jes, mi vere volas restarigi mian pasvorton nun"
+
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Peti rekomencigon"
 
@@ -468,6 +463,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 "Saluton:\n\nNi nur sciigas vin, ke %s kunhavigis %s kun vi.\nVidu ĝin: %s\n\nĜis!"
+
+#: 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"
@@ -483,11 +493,11 @@ msgstr "Sekureca averto"
 
 #: templates/installation.php:25
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
+msgstr "Via PHP versio estas sendefenda je la NULL bajto atako (CVE-2006-7243)"
 
 #: templates/installation.php:26
 msgid "Please update your PHP installation to use ownCloud securely."
-msgstr ""
+msgstr "Bonvolu ĝisdatigi vian instalon de PHP por uzi ownCloud-on sekure."
 
 #: templates/installation.php:32
 msgid ""
@@ -560,22 +570,18 @@ 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 ""
+msgstr "%s haveblas. Ekhavi pli da informo pri kiel ĝisdatigi."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Elsaluti"
 
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "La aŭtomata ensaluto malakceptiĝis!"
 
 #: templates/login.php:10
 msgid ""
@@ -601,7 +607,14 @@ msgstr "Ensaluti"
 
 #: templates/login.php:47
 msgid "Alternative Logins"
-msgstr ""
+msgstr "Alternativaj ensalutoj"
+
+#: 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 "Saluton:<br /><br />Ni nur sciigas vin, ke %s kunhavigis “%s” kun vi.<br /><a href=\"%s\">Vidu ĝin</a><br /><br />Ĝis!"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
@@ -614,4 +627,4 @@ msgstr "jena"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
+msgstr "ownCloud ĝisdatiĝas al eldono %s, tio ĉi povas daŭri je iom da tempo."
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index 2928a0b2ceaf56af1ad15787b0930aa47c2e5703..55a57eb0438973d02179705ee9408c26c1e925af 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano <mstreet@kde.org.ar>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\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"
@@ -64,7 +65,7 @@ msgstr "Malsukcesis skribo al disko"
 
 #: ajax/upload.php:51
 msgid "Not enough storage available"
-msgstr ""
+msgstr "Ne haveblas sufiĉa memoro"
 
 #: ajax/upload.php:83
 msgid "Invalid directory."
@@ -80,7 +81,7 @@ msgstr "Kunhavigi"
 
 #: js/fileactions.js:126
 msgid "Delete permanently"
-msgstr ""
+msgstr "Forigi por ĉiam"
 
 #: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
@@ -120,7 +121,7 @@ msgstr "malfari"
 
 #: js/filelist.js:331
 msgid "perform delete operation"
-msgstr ""
+msgstr "plenumi forigan operacion"
 
 #: js/filelist.js:413
 msgid "1 file uploading"
@@ -146,11 +147,11 @@ msgstr "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, 
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr ""
+msgstr "Via memoro plenas, ne plu eblas ĝisdatigi aŭ sinkronigi dosierojn!"
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr ""
+msgstr "Via memoro preskaÅ­ plenas ({usedSpacePercent}%)"
 
 #: js/files.js:231
 msgid ""
@@ -183,41 +184,41 @@ msgstr "URL ne povas esti malplena."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nevalida dosierujnomo. Uzo de “Shared” rezervatas de Owncloud."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Eraro"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Nomo"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Grando"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Modifita"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 dosierujo"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} dosierujoj"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 dosiero"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} dosierujoj"
 
 #: lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Nevalida dosierujnomo. La uzo de “Shared” estas rezervita de ownCloud."
 
 #: lib/app.php:73
 msgid "Unable to rename file"
@@ -277,7 +278,7 @@ msgstr "El ligilo"
 
 #: templates/index.php:42
 msgid "Deleted files"
-msgstr ""
+msgstr "Forigitaj dosieroj"
 
 #: templates/index.php:48
 msgid "Cancel upload"
@@ -285,7 +286,7 @@ msgstr "Nuligi alŝuton"
 
 #: templates/index.php:54
 msgid "You don’t have write permissions here."
-msgstr ""
+msgstr "Vi ne havas permeson skribi ĉi tie."
 
 #: templates/index.php:61
 msgid "Nothing in here. Upload something!"
@@ -319,4 +320,4 @@ msgstr "Nuna skano"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "Ĝisdatiĝas dosiersistema kaŝmemoro..."
diff --git a/l10n/eo/files_encryption.po b/l10n/eo/files_encryption.po
index 907d1a9902edac5dad55f1898c48093106c738e5..29c9e1a3942567a73fbb1a4ccb98b621483d7ca0 100644
--- a/l10n/eo/files_encryption.po
+++ b/l10n/eo/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano <mstreet@kde.org.ar>, 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"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-25 02:04+0200\n"
+"PO-Revision-Date: 2013-06-24 21:00+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\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"
@@ -37,67 +38,134 @@ msgstr ""
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
-msgstr ""
+msgstr "La pasvorto sukcese ŝanĝiĝis."
 
 #: ajax/changeRecoveryPassword.php:51
 msgid "Could not change the password. Maybe the old password was not correct."
+msgstr "Ne eblis ŝanĝi la pasvorton. Eble la malnova pasvorto malĝustis."
+
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr "La pasvorto de la malpublika klavo sukcese ĝisdatiĝis."
+
+#: 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr "La PHP-modulo OpenSSL ne instalitas."
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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 "persona agordo"
+
 #: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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 ""
+msgstr "Kapabligita"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
-msgstr ""
+msgstr "Malkapabligita"
 
-#: templates/settings-admin.php:32
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
+msgstr "Ŝarĝi pasvorton"
+
+#: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr "La pasvorto de via malpublika klavo ne plu kongruas kun via ensaluta pasvorto:"
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
 msgstr ""
 
-#: templates/settings-personal.php:9
-msgid "Enable password recovery by sharing all files with your administrator:"
+#: 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:11
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr "Malnova ensaluta pasvorto"
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr "Nuna ensaluta pasvorto"
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr "Äœisdatigi la pasvorton de la malpublika klavo"
+
+#: 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 5191563428e3f795f459aeaffb26b53df0b570e9..b19e65069ec6ab1c19f1796c6cd7267c5a0a9c2a 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 2b7afc9e2cf19c2f1a8adf790d7ef512dcf903ae..e55df6f34d85d62d913f806e7e9083be938e854f 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 67bafc70add172e71d187146801c0cb74dcb4d17..9889535bc5a4f1dfdf9205c12b9a287679562f38 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
@@ -41,7 +41,7 @@ msgstr ""
 
 #: js/trash.js:123
 msgid "Delete permanently"
-msgstr ""
+msgstr "Forigi por ĉiam"
 
 #: js/trash.js:176 templates/index.php:17
 msgid "Name"
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index 87d9e2acba3eaedc16fd22bc7494ea52e4266637..80a9c4ce8c4c28d17f820d50de2639fca076171b 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano <mstreet@kde.org.ar>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\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"
@@ -17,27 +18,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"
 
@@ -87,105 +88,105 @@ msgstr "Bildoj"
 
 #: setup.php:34
 msgid "Set an admin username."
-msgstr ""
+msgstr "Starigi administran uzantonomon."
 
 #: setup.php:37
 msgid "Set an admin password."
-msgstr ""
+msgstr "Starigi administran pasvorton."
 
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
-msgstr ""
+msgstr "%s enigu la uzantonomon de la datumbazo."
 
 #: setup.php:58
 #, php-format
 msgid "%s enter the database name."
-msgstr ""
+msgstr "%s enigu la nomon de la datumbazo."
 
 #: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s vi ne povas uzi punktojn en la nomo de la datumbazo"
 
 #: setup.php:64
 #, php-format
 msgid "%s set the database host."
-msgstr ""
+msgstr "%s enigu la gastigon de la datumbazo."
 
-#: 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 ""
+msgstr "La uzantonomo de PostgreSQL aÅ­ la pasvorto ne validas"
 
-#: 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 ""
+msgstr "Konekto al Oracle ne povas stariĝi"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
-msgstr ""
+msgstr "La uzantonomo de MySQL aÅ­ la pasvorto ne validas"
 
-#: 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 ""
+msgstr "Datumbaza eraro: “%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 ""
+msgstr "La uzanto de MySQL “%s”@“localhost” jam ekzistas."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "Forigi ĉi tiun uzanton el MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "La uzanto de MySQL “%s”@“%%” jam ekzistas"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
-msgstr ""
+msgstr "Forigi ĉi tiun uzanton el MySQL."
 
-#: setup.php:466 setup.php:533
+#: setup.php:469 setup.php:536
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "La uzantonomo de Oracle aÅ­ la pasvorto ne validas"
 
-#: 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 ""
+msgstr "La uzantonomo de MS SQL aÅ­ la pasvorto ne validas: %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 ""
+msgstr "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>."
 
 #: template.php:113
 msgid "seconds ago"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 8ef84796bb463d1ba805661aa69a5a31a80228c2..d3fc64da1d9ed4f08323b2875e855eaaeddfb57c 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
 
@@ -190,12 +190,12 @@ msgstr ""
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita."
 
 #: templates/admin.php:33
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
@@ -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 ""
+msgstr "Ekhavu la aplikaĵojn por sinkronigi viajn dosierojn"
 
-#: 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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "Uzantonomo"
+
+#: 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 423b1e96e445765db65391d6de9ed7c8e3dd917a..6b8a1a6a30cccf79667d6cb11e916cca5cc866e9 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 aa3b42b411916dd90f8e972606e3f77de8d49028..c7675bf38739fdc6d03e8571689b95edf00c4d1e 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 acf3a5ce8886163d9c48121e07799ba7e45f6e20..3a028120c63782ee5628809b792f38c01c8d55aa 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -3,17 +3,19 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Art O. Pal <artopal@fastmail.fm>, 2013
 # ggam <ggam@brainleakage.com>, 2013
 # msoko <sokolovitch@yahoo.com>, 2013
+# saskarip <saskarip@gmail.com>, 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: xhiena <xhiena@gmail.com>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,27 +25,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 +39,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 +56,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."
@@ -220,30 +203,30 @@ msgstr "hace años"
 msgid "Choose"
 msgstr "Seleccionar"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: 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 "Error cargando la plantilla del seleccionador de archivos"
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Sí"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 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 +238,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 +377,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:60
 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 +407,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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?"
+
+#: 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:27
 msgid "Request reset"
 msgstr "Solicitar restablecimiento"
 
@@ -466,11 +461,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 +497,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 +519,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 +538,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 +574,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 +603,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 +611,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 686eeea90fb26adfd41190a9025ddb81e5404a64..eaa87e4858e4174b3868116b76de1b6783e0f062 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -185,35 +185,35 @@ msgstr "La URL no puede estar vacía."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "El nombre de carpeta no es válido. El uso de \"Shared\" está reservado para Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Error"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} carpetas"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} archivos"
 
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
index 21f59f5c76089d4638b236ff56d9215849a1da20..7a064fb6f37e5037ff22b3d1fc6ae470efa47462 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.po
@@ -4,13 +4,16 @@
 # 
 # Translators:
 # gmoriello <gmoriello@gmail.com>, 2013
+# saskarip <saskarip@gmail.com>, 2013
+# William Díaz <wdiazux@gmail.com>, 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-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-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 21:40+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,61 +47,128 @@ 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 "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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 ():"
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
-msgstr "Recuperar contraseña"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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 "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
-msgid "Change encryption passwords recovery key:"
-msgstr "Cambiar clave de cifrado de contraseñas:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
-msgstr "Contraseña de recuperación actual"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
+msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
-msgstr "Contraseña de recuperación nueva"
+#: templates/settings-admin.php:48
+msgid "New Recovery key password"
+msgstr ""
 
-#: 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 "Habilitar la recuperación de contraseña:"
+
+#: 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 648f74a81164d41ef628303a6cc748fa41343b74..b4100782eb4aa5dcd82f0bcd66e1a482e664f868 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 ee9aef9a9502ad145d5614f030655de17a6f35cd..ef1b9977dce65a1e3a93134c8b231c634882782c 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 4d786a12214c155e942adf96d65af5ae55ee628c..8a72120f5d97f4119e90717f4aebadccc453f0c7 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 e29d7af6c4455af18821fcde08ef97ec25d14322..9cfbcf417e365da776ba7dd01f24e2b15c5c2bc3 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 353d8839be50ad92c627b87fa3d434e5357a0eb7..d4aef6810bd6c8e34cfe70aea822209176c7e196 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 <saskarip@gmail.com>, 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
 "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
 msgid "Login Name"
 msgstr "Nombre de usuario"
 
@@ -466,34 +467,44 @@ 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:84
+msgid "Username"
+msgstr "Nombre de usuario"
+
+#: 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 5842c6f8db8bc729d2af2f9fad2874244f88d7da..9b35e7338477f0c54c228e04e20c1ccecaefd544 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 9b520ddeaaebbe418cc0a94fb127fa7967659a25..5d60f41af1b29227ca017cd7739e51f281952f2a 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 cf39a7e53930272864c3456823fe34883e439d61..8fbf73599046f94c0a177a9475ac9e5bb2e998e4 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -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 "%s compartió \"%s\" con vos"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -216,23 +198,23 @@ msgstr "años atrás"
 msgid "Choose"
 msgstr "Elegir"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: 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 ""
+msgstr "Error al cargar la plantilla del seleccionador de archivos"
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Sí"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Aceptar"
 
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Tus archivos están encriptados. Si no habilitaste la clave de recuperación, no vas a tener manera de obtener nuevamente tus datos después que se resetee tu contraseña. Si no estás seguro sobre qué hacer, ponete en contacto con el administrador antes de seguir. ¿Estás seguro/a de querer continuar?"
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "Sí, definitivamente quiero resetear mi contraseña ahora"
+
+#: lostpassword/templates/lostpassword.php:27
 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 "Hola,\n\nSimplemente te informo que %s compartió %s con vos.\nMiralo acá: %s\n\n¡Chau!"
+
+#: 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 "Hola,<br><br>Simplemente te informo que %s compartió %s con vos.<br><a href=\"%s\">Miralo acá:</a><br><br>¡Chau!"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "anterior"
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index dd55de5889c9c291e55f077c1871e58927b8d649..fec836f5f224d856d1050a3c2452325c8436fbe0 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -184,35 +184,35 @@ msgstr "La URL no puede estar vacía"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nombre de carpeta inválido. El uso de 'Shared' está reservado por ownCloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Error"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 directorio"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} directorios"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} archivos"
 
diff --git a/l10n/es_AR/files_encryption.po b/l10n/es_AR/files_encryption.po
index 0fd32631ce919c5d3c548ee97235a9dbd4c5d738..aca16b2665df46cb4a6e26c7acdd7213687d8c48 100644
--- a/l10n/es_AR/files_encryption.po
+++ b/l10n/es_AR/files_encryption.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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 14:40+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"
@@ -19,85 +20,152 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Se habilitó la recuperación de archivos"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "No se pudo habilitar la clave de recuperación. Por favor, comprobá tu contraseña."
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Clave de recuperación deshabilitada"
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "No fue posible deshabilitar la clave de recuperación.  Por favor, comprobá tu contraseña."
 
 #: 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 ""
+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 "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 "No fue posible actualizar la contraseña de la clave privada. Tal vez la contraseña antigua no es 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 "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada de alguna manera. Podés actualizar tu clave privada de contraseña en 'configuración personal' para tener acceso nuevamente a tus archivos"
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr "El módulo OpenSSL para PHP no está instalado."
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr "Pedile al administrador del servidor que instale el módulo. Por ahora la App de encriptación está deshabilitada."
 
 #: 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 "¡Tu clave privada no es válida! Tal vez tu contraseña fue cambiada desde afuera."
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr "Podés desbloquear tu clave privada en tu"
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr "Configuración personal"
+
 #: 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 ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr "Habilitar clave de recuperación (te permite recuperar los archivos de usuario en el caso en que pierdas la contraseña):"
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
-msgstr ""
+#: templates/settings-admin.php:14
+msgid "Recovery key password"
+msgstr "Contraseña de recuperación de clave"
 
-#: templates/settings-admin.php:20 templates/settings-personal.php:18
+#: templates/settings-admin.php:21 templates/settings-personal.php:54
 msgid "Enabled"
-msgstr ""
+msgstr "Habilitado"
 
-#: templates/settings-admin.php:28 templates/settings-personal.php:26
+#: templates/settings-admin.php:29 templates/settings-personal.php:62
 msgid "Disabled"
-msgstr ""
+msgstr "Deshabilitado"
 
-#: templates/settings-admin.php:32
-msgid "Change encryption passwords recovery key:"
-msgstr ""
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr "Cambiar contraseña para recuperar la clave:"
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
-msgstr ""
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
+msgstr "Contraseña antigua de recuperación de clave"
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
-msgstr ""
+#: templates/settings-admin.php:48
+msgid "New Recovery key password"
+msgstr "Nueva contraseña de recuperación de clave"
 
-#: 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 ""
+msgstr "Cambiar contraseña"
 
 #: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr "Tu contraseña de recuperación de clave ya no coincide con la contraseña de ingreso:"
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr "Usá tu contraseña de recuperación de clave antigua para tu contraseña de ingreso 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 "Si no te acordás de tu contraseña antigua, pedile al administrador que recupere tus archivos"
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr "Contraseña anterior"
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr "Contraseña actual"
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr "Actualizar contraseña de la clave privada"
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr "Habilitar contraseña 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 ""
+"files in case of password loss"
+msgstr "Habilitando esta opción te va a permitir tener acceso a tus archivos encriptados incluso si perdés la contraseña"
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
-msgstr ""
+msgstr "Las opciones de recuperación de archivos fueron actualizadas"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
-msgstr ""
+msgstr "No fue posible actualizar la recuperación de archivos"
diff --git a/l10n/es_AR/files_external.po b/l10n/es_AR/files_external.po
index 10c00b1fd936715bbc08cbe9f8466793616e83ad..924acbadc41f9ee4c27e45d71e24b82b79a67928 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 e1fb66bf96dacc6ee2d8a35668a54d890c75b659..40f68783157cea3b2db097e432941c965758608b 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 0be5f1364f52c73d2f4730cd00d51933579580a4..6448c511db4279d29d35fc709d08edc35a77e616 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 518d7dfe307f855e43184873016b63f65b14ef6d..e953455fb681c9cc2727524a64f9276dd0f38f8e 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 61bfae4d5fd2221b96046affbbb1bab33d111444..e3d1016a35acd8496b9f4bfb6b2630a99d07d333 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -4,12 +4,13 @@
 # 
 # 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
@@ -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
 msgid "Login Name"
 msgstr "Nombre de "
 
@@ -464,34 +465,44 @@ 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:84
+msgid "Username"
+msgstr "Nombre de usuario"
+
+#: 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 3155fed37457ac6edcedaa21e5bd144eb97d5518..6c5085952d24a1464796a65dc060f43e1c556eac 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: ajax/clearMappings.php:34
 msgid "Failed to clear the mappings."
-msgstr ""
+msgstr "Hubo un error al borrar las asignaciones."
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
@@ -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 ""
@@ -59,7 +60,7 @@ msgstr "No se pudo añadir la configuración del servidor"
 
 #: js/settings.js:111
 msgid "mappings cleared"
-msgstr ""
+msgstr "Asignaciones borradas"
 
 #: js/settings.js:112
 msgid "Success"
@@ -342,7 +343,7 @@ msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especific
 
 #: templates/settings.php:101
 msgid "Internal Username"
-msgstr ""
+msgstr "Nombre interno de usuario"
 
 #: templates/settings.php:102
 msgid ""
@@ -358,15 +359,15 @@ msgid ""
 "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 ""
+msgstr "Por defecto, el nombre interno de usuario va a ser creado a partir del atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. Para el nombre de usuario interno sólo se pueden usar estos caracteres: [a-zA-Z0-9_.@-]. Otros caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. Si ocurrieran colisiones, un número será añadido o incrementado. El nombre interno de usuario se usa para identificar un usuario internamente. Es también el nombre por defecto para el directorio personal del usuario in ownCloud. También es un puerto de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento por defecto puede ser cambiado. Para conseguir un comportamiento similar al anterior a ownCloud 5, ingresá el atributo del nombre en pantalla del usuario en el siguiente campo. Dejalo vacío para el comportamiento por defecto. Los cambios solo tendrán efecto para los nuevos usuarios LDAP."
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
-msgstr ""
+msgstr "Atributo Nombre Interno de usuario:"
 
 #: templates/settings.php:104
 msgid "Override UUID detection"
-msgstr ""
+msgstr "Sobrescribir la detección UUID"
 
 #: templates/settings.php:105
 msgid ""
@@ -377,15 +378,15 @@ msgid ""
 "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 ""
+msgstr "Por defecto, ownCloud detecta automáticamente el atributo UUID. El atributo UUID se usa para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno va a ser creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Podés sobrescribir la configuración y pasar un atributo de tu elección. Tenés que asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Dejalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto sólo en los nuevos usuarios y grupos de LDAP."
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
-msgstr ""
+msgstr "Atributo UUID:"
 
 #: templates/settings.php:107
 msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "Asignación del Nombre de usuario de un usuario LDAP"
 
 #: templates/settings.php:108
 msgid ""
@@ -400,15 +401,15 @@ msgid ""
 "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 ""
+msgstr "ownCloud usa nombres de usuario para almacenar y asignar (meta) datos. Con el fin de identificar con precisión y reconocer usuarios, cada usuario LDAP tendrá un nombre de usuario interno. Esto requiere una asignación de nombre de usuario de ownCloud a usuario LDAP. El nombre de usuario creado se asigna al UUID del usuario LDAP. Además el DN se almacena en caché principalmente para reducir la interacción de LDAP, pero no se utiliza para la identificación. Si la DN cambia, los cambios serán encontrados por ownCloud. El nombre interno de ownCloud se utiliza para todo en ownCloud. Borrar las asignaciones dejará restos en distintos lugares. Borrar las asignaciones no depende de la configuración, ¡afecta a todas las configuraciones de LDAP! No borrar nunca las asignaciones en un entorno de producción. Sólo borrar asignaciones en una situación de prueba o experimental."
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "Borrar la asignación de los Nombres de usuario de los usuarios LDAP"
 
 #: templates/settings.php:109
 msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
 
 #: templates/settings.php:111
 msgid "Test Configuration"
diff --git a/l10n/es_AR/user_webdavauth.po b/l10n/es_AR/user_webdavauth.po
index 752a64616bb247cd971e3cb56a589e28b0bcff1a..aaa1cdcdb30f263af5b4339c3af9759d06ab271c 100644
--- a/l10n/es_AR/user_webdavauth.po
+++ b/l10n/es_AR/user_webdavauth.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-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-25 02:04+0200\n"
+"PO-Revision-Date: 2013-06-24 13:50+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"
@@ -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 "URL: "
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index baa273912541c09b9d1b26a9b873c55186e897ca..cf57d1175c90380185dbff982a624096cda1de40 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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."
@@ -218,23 +199,23 @@ msgstr "aastat tagasi"
 msgid "Choose"
 msgstr "Vali"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Loobu"
 
-#: 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 "Viga failivalija malli laadimisel"
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Jah"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Ei"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 50518ecb5a765d24e242bf509f9fb2d3415ac9df..c07fd0d3169cec7f1ed4d05ebd344967c3d7cf40 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -185,35 +185,35 @@ msgstr "URL ei saa olla tühi."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Vigane kataloogi nimi. 'Shared' kasutamine on reserveeritud ownCloud poolt."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Viga"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Suurus"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Muudetud"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 kaust"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} kausta"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 fail"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} faili"
 
diff --git a/l10n/et_EE/files_encryption.po b/l10n/et_EE/files_encryption.po
index 2bcdd23d94336006fee3f5e578d7221873f695eb..097b0c3eb400e886acd8b6df64434d9607d712c4 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: 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,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
-msgstr "Konto taasteparool"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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 "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
-msgid "Change encryption passwords recovery key:"
-msgstr "Muuda taaste võtme krüpteerimise paroole:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
-msgstr "Konto vana taaste parool"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
+msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
-msgstr "Konto uus taasteparool"
+#: templates/settings-admin.php:48
+msgid "New Recovery key password"
+msgstr ""
 
-#: 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 0cf16cec04e745e51bb272e6c796b3159aa6e53b..bb43b85a2f3363876afe7da92d801ea03fdaae94 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 f1913930b3a322affba61f97c3ca76875bb925f4..0ea609f1c011a3a85d3e95f08687bd606ed0a499 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 9341e71a33f77a4428d56d1efd3f12793d72c66b..1d550e0201fb979e94d5c2254762e403ed9eda2d 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 11702fe711ce98d9f37142f811c54595c42f8b61..849978700138d1ff9bace00045a7d25f7abd6bad 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 aa4192988acf9aba648fae8c6daa72a6bfb87e06..6113a81c875d7468d572ab37c1a135dda34c82e0 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
@@ -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
 msgid "Login Name"
 msgstr "Kasutajanimi"
 
@@ -465,34 +465,44 @@ 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:84
+msgid "Username"
+msgstr "Kasutajanimi"
+
+#: 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 aaf1de90aefeceb307a83621ad391dee080c0a27..633c23e05e1fa7821ca58f34b2b39109a3235042 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 ee2a1e41f432586905c1529ff99d03e54240d4c0..21fbf41a04ff5b12811bd9b61593304f686eebdd 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 ca6ed1e86d0435df023dfbbb68f3b35ecbf4917f..4075125d91e4476b53dc921562903e50f5e8e270 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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."
@@ -216,23 +197,23 @@ msgstr "urte"
 msgid "Choose"
 msgstr "Aukeratu"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Ezeztatu"
 
-#: 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 "Bai"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Ez"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ados"
 
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 78cba47346eca827e8f59c81cf8d45a9e7a7cfac..e56b4fdfcf43abb9302a5fe3129fbb5688366428 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr "URLa ezin da hutsik egon."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Baliogabeako karpeta izena. 'Shared' izena Owncloudek erreserbatzen du"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Errorea"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Izena"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Tamaina"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Aldatuta"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "karpeta bat"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} karpeta"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "fitxategi bat"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} fitxategi"
 
diff --git a/l10n/eu/files_encryption.po b/l10n/eu/files_encryption.po
index 1e367b1e9c5d1643b5d205df606663232a557537..304cd86c002620a261e72291ea55e5f9051b4983 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 11b9c655de8ffe7f6d9ab8d1f7fcd119001769cf..2b0ef136fa7b01a74de7089a3c27e77904bdaf77 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 5b5bb58738425ce1c2a505ec9b48876ebb801bba..0d033e3d96e198a13452f307e219d90eb1959af2 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 649a2d0cfb395b355f5a615bb1f0f75cbf284991..8a909233408fad3f0f3eebc9629f35e197cf4c14 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 4f53b771f66959ab5d374d3fe5a55ca709de5c57..f5ed84b74d7716d230a4c1771e0bb460937fa036 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 c46f05695ce743c03ceec67ca3ccd65262f00a9a..f1faa72a3fb5e30f4783256647dc239f7e87bba1 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr "Sarrera Izena"
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "Erabiltzaile izena"
+
+#: 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 0c4381c59a7a4c58c8568e11b752b24e71410ba8..56e299b91312ba6515d956d0411a346dcd72121a 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 c9297b3ff2eeafbef61fd740c64b81fb2dee6033..03f85ec7ec0c32eeb8f50c72b9b8bc42775e4156 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 c5157131f542ef7c767c77cdc2540dcd53ba5f27..1cc51050faa2ac91aa00ddffb852f1c0377d5196 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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."
@@ -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 "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 6ef2b14e0ad9db986c094a056b2671e55c66ca8b..3a5b7779bd40b5123dccea0d266734147e0668bc 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr "URL  نمی تواند خالی باشد."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "نام پوشه نامعتبر است. استفاده از \" به اشتراک گذاشته شده \" متعلق به سایت Owncloud است."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "خطا"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "نام"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "اندازه"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "تاریخ"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 پوشه"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{ شمار} پوشه ها"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 پرونده"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{ شمار } فایل ها"
 
diff --git a/l10n/fa/files_encryption.po b/l10n/fa/files_encryption.po
index 67d35105e3b406fc3a513458e3cec20e51bc3853..1ba2d79e2e76a3cec9c62ff20c8179e91b3beb25 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "در حال ذخیره سازی..."
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 6b9d66b9379c4632ef41ba54e7140ad8096472b3..a8224ed9b2db9d55eb80a47fd1640a3daf5efd48 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 ee80c80cffc67d0579439b68b5d957eb2df9d24a..9e3677fcdd73c98c6dfebe9b5a65fe9253072a80 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 5160bbb6762b9b6329519062fa25b6fe781bb0f4..54e6f84456828f194a809446bcf544e22498d41c 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 a2961ae8a0f2444ac544a4ae45e0005fd7f75386..a9ac1b53c734513bb372528d8308979c35f485dd 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 1d1284b04ef0719c5b4bac9023a71e1785e2f4e2..9a6956a55148b68b4368adfaddbd30ccfb736b42 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr "نام کاربری"
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "نام کاربری"
+
+#: 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 1c94dc4aea40c3fb3d161dcbb9d1d1b26c37ceca..c09193d7c95f6d8faa3dc6a6cb9d2bbe1aac4773 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 f89e5c1febbda3f5564b596c173c4a214bedfc51..1310a3b5e67ef063de596dde1590f9a83f98e0df 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/core.po b/l10n/fi/core.po
index 2155ced94251ad5d6d8c58911cc3ae4a6a99b905..3c7faf864aea71f98882fb171f3e87a7abd756b3 100644
--- a/l10n/fi/core.po
+++ b/l10n/fi/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-02 02:01+0200\n"
-"PO-Revision-Date: 2013-06-02 00:02+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
@@ -216,23 +216,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 ""
 
diff --git a/l10n/fi/lib.po b/l10n/fi/lib.po
index 34b8a345ccd924ace706c70002434717e4c86b54..6563cd823d7b701afe2a80f59f02632e6e335926 100644
--- a/l10n/fi/lib.po
+++ b/l10n/fi/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-02 02:01+0200\n"
-"PO-Revision-Date: 2013-06-02 00:02+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 9ebc3e72d7203d305378178773d3dc0aef723e11..509eb435e3923722af3cc680570516fd608ddead 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -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 "%s jakoi kohteen »%s« kanssasi"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -217,23 +198,23 @@ msgstr "vuotta sitten"
 msgid "Choose"
 msgstr "Valitse"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Peru"
 
-#: 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 "Kyllä"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Ei"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "Kyllä, haluan nollata salasanani nyt"
+
+#: lostpassword/templates/lostpassword.php:27
 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 "Hei!\n\n%s jakoi kohteen %s kanssasi.\nKatso se tästä: %s\n\nNäkemiin!"
+
+#: 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 "Hei!<br><br>%s jakoi kohteen »%s« kanssasi.<br><a href=\"%s\">Katso se tästä!</a><br><br>Näkemiin!"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "edellinen"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index c797fa053dce19cf1f96fed5f4ac6dfcb603604c..b5f034992c53c2efd80f28aced866947eb85908b 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr "Verkko-osoite ei voi olla tyhjä"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Virhe"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Koko"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Muokattu"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 kansio"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} kansiota"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 tiedosto"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} tiedostoa"
 
diff --git a/l10n/fi_FI/files_encryption.po b/l10n/fi_FI/files_encryption.po
index df1e78980c08532cdbdbdbd452f1120956a980b5..22b5cf43758873e5fec861da86250ad44a27a47f 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -44,61 +44,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 799f6ad90bd291fd12456f25ee0eaf0668df7a37..14a8a6d025acf762756bd721a1ae0c4f0d96ce00 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 5e32d3b535dd16912c9197a8dbf738b7a8f55335..4d175ceb5358b445724cd96070d0714b2118a323 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 67e93e12bacf662aa856c554fd4f419b8cd8fcc8..b801dab501267ae8031aa41ded35624976bd6598 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 b9daa415a2a58fc8f568bdbb688439e1411dd0d8..3bb2c74afca0225eec0fc06741d8b391e45d13f6 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 ae577b6479ba285afdcfb5da29ced0dd31fdd50b..2a3545238a2c44c15905765fa4cb4f5e4234ccaa 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr "Kirjautumisnimi"
 
@@ -464,34 +464,44 @@ 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:84
+msgid "Username"
+msgstr "Käyttäjätunnus"
+
+#: 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 8dc1297ab7f53f78fb7c5995eb0d160440ce387c..af5ea17cd638d421f86c649af0b6d1ff1f69d6a5 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 03611071936b7c233bc450c402e0d7dac0f90abe..f38e5770f385e2b7a9f58b6baa13c60967e07a33 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 4f2b687146945fdd527399d31828ef9a7ae917d9..38f654610fce47a2b1c2fb7c87e088eceaf8ba89 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -3,15 +3,18 @@
 # 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
 # msoko <sokolovitch@yahoo.com>, 2013
 # plachance <patlachance@gmail.com>, 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: msoko <sokolovitch@yahoo.com>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,27 +24,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."
@@ -218,23 +202,23 @@ msgstr "il y a plusieurs années"
 msgid "Choose"
 msgstr "Choisir"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Annuler"
 
-#: 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 ""
+msgstr "Erreur de chargement du modèle du sélecteur de fichier"
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Oui"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Non"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -394,7 +378,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:60
 msgid "ownCloud password reset"
 msgstr "Réinitialisation de votre mot de passe Owncloud"
 
@@ -422,7 +406,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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura plus aucun moyen de récupérer vos données une fois le mot de passe réinitialisé. Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. Voulez-vous vraiment continuer ?"
+
+#: 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:27
 msgid "Request reset"
 msgstr "Demander la réinitialisation"
 
@@ -470,6 +466,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"
@@ -562,16 +573,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"
 
@@ -605,6 +612,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 a092018dce0c56c8b77210f6d907cc01daf7190d..e383782a58757de8b53ada21ff6f4a3134756efb 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -185,35 +185,35 @@ msgstr "L'URL ne peut-être vide"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée à Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Erreur"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Taille"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Modifié"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 dossier"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} dossiers"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 fichier"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} fichiers"
 
diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po
index e5b30416823b4b8a50baf16b8c105df5673178d4..8b0424765842fb2d14807583d68b874ffa898582 100644
--- a/l10n/fr/files_encryption.po
+++ b/l10n/fr/files_encryption.po
@@ -3,12 +3,16 @@
 # 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
+# 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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
+"POT-Creation-Date: 2013-06-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,85 +23,152 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Clé de récupération activée avec succès"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Ne peut pas activer la clé de récupération. s'il vous plait vérifiez votre mot de passe de clé de récupération!"
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Clé de récupération désactivée avc succès"
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "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!"
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Mot de passe changé avec succès "
 
 #: ajax/changeRecoveryPassword.php:51
 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 "Votre clef privée est invalide ! Votre mot de passe a peut-être été modifié depuis l'extérieur. Vous pouvez mettre à jour le mot de passe de votre clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers"
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Enregistrement..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr "Votre clef privée est invalide ! Votre mot de passe a peut-être été modifié depuis l'extérieur."
+
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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 ""
+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 ""
+msgstr "Désactiver"
 
-#: templates/settings-admin.php:32
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 ""
+msgstr "Changer de mot de passe"
 
 #: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr "Le mot de passe de votre clef privée ne correspond plus à votre mot de passe de connexion :"
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr "Configurez le mot de passe de votre ancienne clef privée avec votre mot de passe courant de connexion. "
+
+#: 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 vous ne vous souvenez plus de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers."
+
+#: 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 ""
+"files in case of password loss"
+msgstr "Activer cette option vous permettra d'obtenir à nouveau l'accès à vos fichiers chiffrés en cas de perte de mot de passe"
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
-msgstr ""
+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 ""
+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 b7dc04db5642341b9a0a4dd729bc22e49d8ad254..bfb9c872a9b43d5d150a8774dd52356e35e9397d 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 f8171e53ba13b02458886a6fd0e8b6a17a43690f..06fd8fa8cb82b46c7ddd341b6ace7a2176777a64 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 cf2e6250af81d82315eefa08c541950ef0d030e7..7d5f29bf0a0ea3567b52acd3c59ba1fe31c42fa6 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 db6584de9ad50217722f4a4991d3838ee6ef3462..a5f08d463f660327bcbd2ce994163ce7701245ab 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 809d6777e2996037e7984512743240c1ad012988..08e7fed71fda98bdcba95deafe06e4b913925b3f 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -4,12 +4,14 @@
 # 
 # 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
@@ -59,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"
 
@@ -137,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"
 
@@ -325,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 "
@@ -339,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"
 
@@ -387,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
 msgid "Login Name"
 msgstr "Nom de la connexion"
 
@@ -464,34 +466,44 @@ msgstr "Nom de la connexion"
 msgid "Create"
 msgstr "Créer"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
-msgstr ""
+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:84
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
+#: 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 413aa4f723433d18de17dcb7d9ce8ab07e87c78a..c4b7ee0fee802d5968246e42ca5684c623175d7a 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 d1834912d730d8a5f223c60f1cebffaf418525f5..592ae748bc3cfc8ea400457e0a11fbb693f3b12c 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 2e363e38a494d1ea65f6a1abfe13b142ddf8d01d..4ae5147bca824ebe9a9758ea2554e07efc49056f 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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."
@@ -217,23 +198,23 @@ msgstr "anos atrás"
 msgid "Choose"
 msgstr "Escoller"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: 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 "Produciuse un erro ao cargar o modelo do selector de ficheiros"
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Si"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Non"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Aceptar"
 
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "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:27
 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 0ee9089b6a52b7623647da4f54586d7d87d3d6fa..684d45ae22fa1cde06ba117280c5bbc00470f555 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -184,35 +184,35 @@ msgstr "O URL non pode quedar baleiro."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nome de cartafol incorrecto. O uso de «Shared» está reservado por Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Erro"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 cartafol"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} cartafoles"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} ficheiros"
 
diff --git a/l10n/gl/files_encryption.po b/l10n/gl/files_encryption.po
index df19cbea75f00ba055cca9e96493acaa345c4a92..3552cb781838be76c6e8c04967c60a21af3a99ef 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-24 02:01+0200\n"
+"PO-Revision-Date: 2013-06-23 11:37+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,128 @@ 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"
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr "O módulo PHP OpenSSL non está instalado."
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr "Pregúntelle ao administrador do servidor pola instalación do módulo. Polo de agora o aplicativo de cifrado foi desactivado."
+
 #: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr "Activar a chave de recuperación (permitirá recuperar os ficheiros dos usuarios no caso de perda do contrasinal):"
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
-msgstr "Recuperación do contrasinal da conta"
+#: templates/settings-admin.php:14
+msgid "Recovery key password"
+msgstr "Contrasinal da chave de recuperación"
 
-#: 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
-msgid "Change encryption passwords recovery key:"
-msgstr "Cambiar a chave de la recuperación do cifrado de contrasinais:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr "Cambiar o contrasinal da chave de la recuperación:"
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
-msgstr "Antigo contrasinal de recuperación da conta"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
+msgstr "Antigo contrasinal da chave de recuperación"
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
-msgstr "Novo contrasinal de recuperación da conta"
+#: templates/settings-admin.php:48
+msgid "New Recovery key password"
+msgstr "Novo contrasinal da chave de recuperación"
 
-#: 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 11e70ec65498df351a2f1a536deca92bedd90622..c03d12e26853c8f9e48c6b1667e08f2c41c32845 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 a65f3b54e49a3b304e735895f7570e1ef50ee0b6..432220cf0a262ff442dcacd6eb65dadbc98cce02 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 2c02309e78e0da9cffdd78fcfafb8577a02922d7..23c264433c8fd7ee902bd785fe86a442693691a9 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 941229a6b88725f95d8b2c4aac55cf296c364913..750805bb5b01923a1b085a3f5f612cef5ef76e20 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 c20ca89cf7f6e659b9d4b6cba422282ebc7f6677..c25f1a45148e161bad70c4955385afaa48e0ac9e 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr "Nome de acceso"
 
@@ -464,34 +464,44 @@ 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:84
+msgid "Username"
+msgstr "Nome de usuario"
+
+#: 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 9a807cb786863768d667888fbeac56062e776b19..5d626e7ef436e38ed38eab7268b8b2f3bef2af00 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 779cbf82bae6b5b4309115a0dac7f0ec1116729b..d92c173664b45293059c360edf976dd593539322 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 a7cdb7b902dfc3854a3cdd05dced40ac80a963df..96d097adf830663acb2671134ad70bfbc3988270 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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."
@@ -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 ""
+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 "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "איפוס הססמה של ownCloud"
 
@@ -406,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 "הקישור לאיפוס הססמה שלך נשלח אליך בדוא״ל.<br>אם לא קיבלת את הקישור תוך זמן סביר, מוטב לבדוק את תיבת הזבל שלך.<br>אם ההודעה לא שם, כדאי לשאול את מנהל הרשת שלך ."
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "הבקשה נכשלה!<br>האם כתובת הדוא״ל/שם המשתמש שלך נכונים?"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
@@ -421,7 +402,19 @@ msgstr "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הסס
 msgid "Username"
 msgstr "שם משתמש"
 
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:22
+msgid ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 "ערוך קטגוריות"
@@ -488,7 +496,7 @@ msgstr "גרסת ה־PHP פגיעה בפני התקפת בית NULL/ריק (CVE-
 
 #: templates/installation.php:26
 msgid "Please update your PHP installation to use ownCloud securely."
-msgstr ""
+msgstr "נא לעדכן את התקנת ה־PHP שלך כדי להשתמש ב־PHP בבטחה."
 
 #: templates/installation.php:32
 msgid ""
@@ -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 ""
+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 1fdea3414068f912d00dab8a6ebf25e46cd7b823..833ad6436c3f70c77b6b731dbfeb695112c73c36 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,12 +21,12 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "לא ניתן להעביר את %s - קובץ בשם הזה כבר קיים"
 
 #: ajax/move.php:27 ajax/move.php:30
 #, php-format
 msgid "Could not move %s"
-msgstr ""
+msgstr "לא ניתן להעביר את %s"
 
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
@@ -64,11 +65,11 @@ msgstr "הכתיבה לכונן נכשלה"
 
 #: ajax/upload.php:51
 msgid "Not enough storage available"
-msgstr ""
+msgstr "אין די שטח פנוי באחסון"
 
 #: ajax/upload.php:83
 msgid "Invalid directory."
-msgstr ""
+msgstr "תיקייה שגויה."
 
 #: appinfo/app.php:12
 msgid "Files"
@@ -120,7 +121,7 @@ msgstr "ביטול"
 
 #: js/filelist.js:331
 msgid "perform delete operation"
-msgstr ""
+msgstr "ביצוע פעולת מחיקה"
 
 #: js/filelist.js:413
 msgid "1 file uploading"
@@ -128,7 +129,7 @@ msgstr "קובץ אחד נשלח"
 
 #: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr ""
+msgstr "קבצים בהעלאה"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
@@ -183,35 +184,35 @@ msgstr "קישור אינו יכול להיות ריק."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "שגיאה"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "שם"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "גודל"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "זמן שינוי"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "תיקייה אחת"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} תיקיות"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "קובץ אחד"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} קבצים"
 
@@ -221,7 +222,7 @@ msgstr ""
 
 #: lib/app.php:73
 msgid "Unable to rename file"
-msgstr ""
+msgstr "לא ניתן לשנות את שם הקובץ"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
diff --git a/l10n/he/files_encryption.po b/l10n/he/files_encryption.po
index d2120666022fa83e4b6e2403dbbe2c388633515a..3ca864005cc60a71b4390d3a4ac9cbd8260afc58 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "שמירה…"
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 3b0478cada5203e3696484aab3c01a084897bf83..7db359cc67955f173561f36e540654bfa4a156d8 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 5428e9f8756e6eba5430010cc9028c77c08ed9ce..e1a1fbc78099fd1aa89d18f82e7a4ca4429794d9 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 fd7ab0c664957b617eb2378018db805b03a4ef8e..3093babfb459158222d0a94b720951db342d290e 100644
--- a/l10n/he/files_trashbin.po
+++ b/l10n/he/files_trashbin.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,16 +21,16 @@ msgstr ""
 #: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr "בלתי אפשרי למחוק את %s לצמיתות"
+msgstr "לא ניתן למחוק את %s לצמיתות"
 
 #: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
-msgstr "בלתי אפשרי לשחזר את %s"
+msgstr "לא ניתן לשחזר את %s"
 
 #: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
-msgstr "בצע פעולת שחזור"
+msgstr "ביצוע פעולת שחזור"
 
 #: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
@@ -37,11 +38,11 @@ msgstr "שגיאה"
 
 #: js/trash.js:34
 msgid "delete file permanently"
-msgstr "מחק קובץ לצמיתות"
+msgstr "מחיקת קובץ לצמיתות"
 
 #: js/trash.js:123
 msgid "Delete permanently"
-msgstr "מחק לצמיתות"
+msgstr "מחיקה לצמיתות"
 
 #: js/trash.js:176 templates/index.php:17
 msgid "Name"
@@ -69,11 +70,11 @@ msgstr "{count} קבצים"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
-msgstr "שום דבר כאן. סל המחזור שלך ריק!"
+msgstr "אין כאן שום דבר. סל המיחזור שלך ריק!"
 
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
-msgstr "שחזר"
+msgstr "שחזור"
 
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
@@ -81,4 +82,4 @@ msgstr "מחיקה"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "קבצים שנמחקו"
diff --git a/l10n/he/files_versions.po b/l10n/he/files_versions.po
index b6e191d2379942510285f611ee43e60130456d83..fbb47670af4d69754bd60b42ff5884f84c4e267e 100644
--- a/l10n/he/files_versions.po
+++ b/l10n/he/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Yaron Shahrabani <sh.yaron@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:28+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-08 02:03+0200\n"
+"PO-Revision-Date: 2013-06-07 09: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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,33 +21,33 @@ msgstr ""
 #: ajax/rollbackVersion.php:15
 #, php-format
 msgid "Could not revert: %s"
-msgstr ""
+msgstr "לא ניתן להחזיר: %s"
 
 #: history.php:40
 msgid "success"
-msgstr ""
+msgstr "הושלם"
 
 #: history.php:42
 #, php-format
 msgid "File %s was reverted to version %s"
-msgstr ""
+msgstr "הקובץ %s הוחזר לגרסה %s"
 
 #: history.php:49
 msgid "failure"
-msgstr ""
+msgstr "נכשל"
 
 #: history.php:51
 #, php-format
 msgid "File %s could not be reverted to version %s"
-msgstr ""
+msgstr "לא ניתן להחזיר את הקובץ %s לגרסה %s"
 
 #: history.php:69
 msgid "No old versions available"
-msgstr ""
+msgstr "אין גרסאות ישנות זמינות"
 
 #: history.php:74
 msgid "No path specified"
-msgstr ""
+msgstr "לא צוין נתיב"
 
 #: js/versions.js:6
 msgid "Versions"
@@ -54,4 +55,4 @@ msgstr "גרסאות"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr ""
+msgstr "ניתן להחזיר קובץ לגרסה קודמת על ידי לחיצה על לחצן ההחזרה שלו"
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
index 864047c853bc2ba2ef287f0862e6c1f859c3451b..5d16ab1f58efa62fcc40de2653d544dd5f65601b 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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,79 +113,79 @@ 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 ""
+msgstr "שרת האינטרנט שלך אינו מוגדר לצורכי סנכרון קבצים עדיין כיוון שמנשק ה־WebDAV כנראה אינו תקין."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "נא לעיין שוב ב<a href='%s'>מדריכי ההתקנה</a>."
 
 #: template.php:113
 msgid "seconds ago"
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 3022e30dc04d97ba9c25dec1a771e94f96d0200d..e9072e8a0802a0611682e6862ee4c61c0030edf8 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Yaron Shahrabani <sh.yaron@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -28,11 +29,11 @@ msgstr "שגיאת הזדהות"
 
 #: ajax/changedisplayname.php:31
 msgid "Your display name has been changed."
-msgstr ""
+msgstr "שם התצוגה שלך הוחלף."
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
-msgstr ""
+msgstr "לא ניתן לשנות את שם התצוגה"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
@@ -58,7 +59,7 @@ msgstr "דוא״ל לא חוקי"
 msgid "Unable to delete group"
 msgstr "לא ניתן למחוק את הקבוצה"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr "לא ניתן למחוק את המשתמש"
 
@@ -86,11 +87,11 @@ msgstr "לא ניתן להסיר משתמש מהקבוצה %s"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr ""
+msgstr "לא ניתן לעדכן את היישום."
 
 #: js/apps.js:30
 msgid "Update to {appversion}"
-msgstr ""
+msgstr "עדכון לגרסה {appversion}"
 
 #: js/apps.js:36 js/apps.js:76
 msgid "Disable"
@@ -102,7 +103,7 @@ msgstr "הפעלה"
 
 #: js/apps.js:55
 msgid "Please wait...."
-msgstr ""
+msgstr "נא להמתין…"
 
 #: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
 msgid "Error"
@@ -110,15 +111,15 @@ msgstr "שגיאה"
 
 #: js/apps.js:90
 msgid "Updating...."
-msgstr ""
+msgstr "מתבצע עדכון…"
 
 #: js/apps.js:93
 msgid "Error while updating app"
-msgstr ""
+msgstr "אירעה שגיאה בעת עדכון היישום"
 
 #: js/apps.js:96
 msgid "Updated"
-msgstr ""
+msgstr "מעודכן"
 
 #: js/personal.js:118
 msgid "Saving..."
@@ -126,7 +127,7 @@ msgstr "שמירה…"
 
 #: js/users.js:47
 msgid "deleted"
-msgstr ""
+msgstr "נמחק"
 
 #: js/users.js:47
 msgid "undo"
@@ -134,36 +135,36 @@ msgstr "ביטול"
 
 #: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+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 "מחיקה"
 
 #: js/users.js:269
 msgid "add group"
-msgstr ""
+msgstr "הוספת קבוצה"
 
 #: js/users.js:428
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "יש לספק שם משתמש תקני"
 
 #: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
-msgstr ""
+msgstr "יצירת המשתמש נכשלה"
 
 #: js/users.js:434
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "יש לספק ססמה תקנית"
 
 #: personal.php:35 personal.php:36
 msgid "__language_name__"
@@ -184,22 +185,22 @@ msgstr "יתכן שתיקיית הנתונים והקבצים שלך נגישי
 
 #: templates/admin.php:29
 msgid "Setup Warning"
-msgstr ""
+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 ""
+msgstr "שרת האינטרנט שלך אינו מוגדר לצורכי סנכרון קבצים עדיין כיוון שמנשק ה־WebDAV כנראה אינו תקין."
 
 #: templates/admin.php:33
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "נא לעיין שוב ב<a href='%s'>מדריכי ההתקנה</a>."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "המודול „fileinfo“ חסר"
 
 #: templates/admin.php:47
 msgid ""
@@ -221,7 +222,7 @@ msgstr ""
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr ""
+msgstr "החיבור לאינטרנט אינו פעיל"
 
 #: templates/admin.php:78
 msgid ""
@@ -235,11 +236,11 @@ msgstr ""
 
 #: templates/admin.php:92
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "יש להפעיל משימה אחת עם כל עמוד שנטען"
 
 #: templates/admin.php:111
 msgid ""
@@ -255,47 +256,47 @@ msgstr ""
 
 #: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "שיתוף"
 
 #: templates/admin.php:134
 msgid "Enable Share API"
-msgstr ""
+msgstr "הפעלת API השיתוף"
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "לאפשר ליישום להשתמש ב־API השיתוף"
 
 #: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "לאפשר קישורים"
 
 #: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "לאפשר למשתמשים לשתף פריטים "
 
 #: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "לאפשר שיתוף מחדש"
 
 #: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "לאפשר למשתמשים לשתף הלאה פריטים ששותפו אתם"
 
 #: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "לאפשר למשתמשים לשתף עם כל אחד"
 
 #: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "לאפשר למשתמשים לשתף עם משתמשים בקבוצות שלהם בלבד"
 
 #: templates/admin.php:168
 msgid "Security"
-msgstr ""
+msgstr "אבטחה"
 
 #: templates/admin.php:181
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "לאלץ HTTPS"
 
 #: templates/admin.php:182
 msgid ""
@@ -314,7 +315,7 @@ msgstr "יומן"
 
 #: templates/admin.php:196
 msgid "Log level"
-msgstr ""
+msgstr "רמת הדיווח"
 
 #: templates/admin.php:227
 msgid "More"
@@ -324,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 "
@@ -338,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 "עדכון"
 
@@ -380,117 +381,127 @@ msgstr "פורום"
 
 #: templates/help.php:14
 msgid "Bugtracker"
-msgstr ""
+msgstr "עוקב תקלות"
 
 #: templates/help.php:17
 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 ""
+msgstr "הצגת אשף ההפעלה הראשונית שוב"
+
+#: 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:37 templates/users.php:23 templates/users.php:82
+#: 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 ""
+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 ""
+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
 msgid "Login Name"
-msgstr ""
+msgstr "שם כניסה"
 
 #: templates/users.php:30
 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 ""
+msgstr "אחסון בררת המחדל"
 
-#: templates/users.php:44 templates/users.php:138
+#: templates/users.php:48 templates/users.php:142
 msgid "Unlimited"
-msgstr ""
+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:84
+msgid "Username"
+msgstr "שם משתמש"
+
+#: templates/users.php:91
 msgid "Storage"
-msgstr ""
+msgstr "אחסון"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
-msgstr ""
+msgstr "החלפת שם התצוגה"
 
-#: templates/users.php:102
+#: templates/users.php:106
 msgid "set new password"
-msgstr ""
+msgstr "הגדרת ססמה חדשה"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
-msgstr ""
+msgstr "בררת מחדל"
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index c13ba23bce584363d1e1bbcdc74631242fe0f678..e287c5fe8f952a2120a339b2b550fc5666100901 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 43d52925cb34a8ca1d0f5ade8032549db70e5f02..ac898b74676bc1bea2dabe95cd87d724a6d22ae0 100644
--- a/l10n/he/user_webdavauth.po
+++ b/l10n/he/user_webdavauth.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Yaron Shahrabani <sh.yaron@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: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -19,10 +20,10 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "WebDAV Authentication"
-msgstr ""
+msgstr "הזדהות מול WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: http://"
+msgid "URL: "
 msgstr ""
 
 #: templates/settings.php:7
@@ -30,4 +31,4 @@ 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 ""
+msgstr "מערכת ownCloud תשלח את פרטי המשתמש לכתובת זו. התוסף יבדוק את התגובה ויתרגם את הקודים 401 ו־403 כתגובה לציון פרטי גישה שגויים ואת כל שאר התגובות כפרטי גישה נכונים."
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index 735dee9d9cb619cee95160519cec23f997b47528..16cd4bf3461b88279d914c8bdeb8eee27db3e772 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# rktaiwala <rktaiwala@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-02 02:01+0200\n"
-"PO-Revision-Date: 2013-06-01 00:02+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -19,26 +20,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
@@ -110,51 +92,51 @@ msgstr ""
 
 #: js/config.php:45
 msgid "January"
-msgstr ""
+msgstr "जनवरी"
 
 #: js/config.php:46
 msgid "February"
-msgstr ""
+msgstr "फरवरी"
 
 #: js/config.php:47
 msgid "March"
-msgstr ""
+msgstr "मार्च"
 
 #: js/config.php:48
 msgid "April"
-msgstr ""
+msgstr "अप्रैल"
 
 #: js/config.php:49
 msgid "May"
-msgstr ""
+msgstr "मई"
 
 #: js/config.php:50
 msgid "June"
-msgstr ""
+msgstr "जून"
 
 #: js/config.php:51
 msgid "July"
-msgstr ""
+msgstr "जुलाई"
 
 #: js/config.php:52
 msgid "August"
-msgstr ""
+msgstr "अगस्त"
 
 #: js/config.php:53
 msgid "September"
-msgstr ""
+msgstr "सितम्बर"
 
 #: js/config.php:54
 msgid "October"
-msgstr ""
+msgstr "अक्टूबर"
 
 #: js/config.php:55
 msgid "November"
-msgstr ""
+msgstr "नवंबर"
 
 #: js/config.php:56
 msgid "December"
-msgstr ""
+msgstr "दिसम्बर"
 
 #: js/js.js:286
 msgid "Settings"
@@ -216,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 ""
 
@@ -263,7 +245,7 @@ msgstr ""
 
 #: js/share.js:90
 msgid "Share"
-msgstr ""
+msgstr "साझा करें"
 
 #: js/share.js:125 js/share.js:617
 msgid "Error while sharing"
@@ -287,7 +269,7 @@ msgstr ""
 
 #: js/share.js:159
 msgid "Share with"
-msgstr ""
+msgstr "के साथ साझा"
 
 #: js/share.js:164
 msgid "Share with link"
@@ -392,7 +374,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr ""
 
@@ -420,7 +402,19 @@ msgstr "पासवर्ड बदलने कि लिंक आपको 
 msgid "Username"
 msgstr "प्रयोक्ता का नाम"
 
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:22
+msgid ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr ""
 
@@ -468,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 ""
@@ -560,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 "लोग  आउट"
 
@@ -603,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 4fbd84f19965309069a6cd6dd067e588cc20edf5..118e99b7e504167c7fe85a9bcfbbac4c8842fb57 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-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:26+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -76,7 +76,7 @@ msgstr ""
 
 #: js/fileactions.js:116
 msgid "Share"
-msgstr ""
+msgstr "साझा करें"
 
 #: js/fileactions.js:126
 msgid "Delete permanently"
@@ -183,35 +183,35 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr ""
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr ""
 
@@ -257,7 +257,7 @@ msgstr ""
 
 #: templates/admin.php:26
 msgid "Save"
-msgstr ""
+msgstr "सहेजें"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/hi/files_encryption.po b/l10n/hi/files_encryption.po
index 1b6ebe3c0011efdfd09ab047fcf50ca349696af8..8d7f5366c80aea385554f3eb5e2f3c57d4a40172 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 5a9ccbc09ed3e65099c29dca598aea4315f0a1d3..5e55ff44de4ce0cc07193f92878cf887893d7228 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-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: 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 fa9881916457ae30d7802661a4665defb1421a8d..f8ac471b2baea5db17389b385f23580af565a1d1 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-02 02:01+0200\n"
-"PO-Revision-Date: 2013-06-02 00:02+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 c81fb256e3b3a4c45de1eb1ba97b3cff0a244857..90989723702f7b76576e065bf8fefc2654d09321 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-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\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:105
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:108
+#: 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:68
+#: templates/personal.php:74
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:96
+#: 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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "प्रयोक्ता का नाम"
+
+#: 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_ldap.po b/l10n/hi/user_ldap.po
index 2bcde19cb2951cfe25c183b47370135a165fb515..43f46c038a48f48b1714d913fce7d262debe5e17 100644
--- a/l10n/hi/user_ldap.po
+++ b/l10n/hi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-06-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hi/user_webdavauth.po b/l10n/hi/user_webdavauth.po
index 712626e49c00d2cf6fc0f413d0e5dbf3083e65f9..25d78227a57887b6d7252d7a85cf48d9ae7b4969 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 55e918788a602a2ebb8a0ed31a153f8665c562c1..fcb4fb73049e9ebec283c11d38915f53e0ba5c5a 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
@@ -216,23 +197,23 @@ msgstr "godina"
 msgid "Choose"
 msgstr "Izaberi"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Odustani"
 
-#: 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 "Da"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Ne"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "U redu"
 
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 972d46958a1636bb5772a03d597b11d8e6ea6909..f2b442e6d786bb233a0c434d856f05f93e1b6814 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Greška"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Zadnja promjena"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/hr/files_encryption.po b/l10n/hr/files_encryption.po
index bbff99c9b09dee8f767809a810488a7001b8159d..afc42cffaec79ef7cbbabee9b3ae9adff916850a 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 6d9da77d95c67bc31b4486a319ff656badaa8d88..65a5177cdbac8f59ef8f08452fed3e3cd33dbcd6 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 e6b5a7e3756f6fdd52c548c41333cda10d51b1b1..7ca4969c3ba3f0da8732674f64bc2ec839edba36 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 533e3e43ed2fde4c1673ea2a3c801273d9a7305c..fac04e71f068af022a276773b5c1bb2f3badf8b5 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 ad1192b736e6d7e9100794e455518739fa828924..02db02f21fa19853cfbf530e46e8fef1ba36fa91 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 0aa248f1b26ea74a947633e60b7adcf939d1e088..c05a173698b164e79cbd6b6ea2aaf30da0c433ff 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "Korisničko ime"
+
+#: 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 450e358e9f41ba499165d4817902b459d9bfbf70..19364072edd5da3b6260afd6d3c66a71c488c7fc 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 bc4382e068d2a2e4902dd952ddfac80118348c2d..b0b3a830c3a16a2ffe4348a905ab1d3412cb663a 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 b70fc5e11252d688397385613d90684ed0444930..ebc29ae86cb9f5fdbb0108a593e747788f7baff5 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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 "%s megosztotta Önnel ezt:  »%s«"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -217,23 +198,23 @@ msgstr "több éve"
 msgid "Choose"
 msgstr "Válasszon"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: 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 "Nem sikerült betölteni a fájlkiválasztó sablont"
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Igen"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Nem"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "Igen, tényleg meg akarom változtatni a jelszavam"
+
+#: lostpassword/templates/lostpassword.php:27
 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 "Üdv!\n\nÚj hír: %s megosztotta Önnel ezt: %s.\nItt nézhető meg: %s\n\nMinden jót!"
+
+#: 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 "Üdv!<br><br>Új hír: %s megosztotta Önnel ezt:  »%s«.<br><a href=\"%s\">Itt nézhető meg!</a><br><br>Minden jót!"
+
 #: 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 ac39b2cd630e3fa0b2aa0a695fc91b0876caf531..ea61959f14b4d8dc6d6df6149d4041d28f929465 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -184,35 +184,35 @@ msgstr "Az URL nem lehet semmi."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Érvénytelen mappanév. A név használata csak a Owncloud számára lehetséges."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Hiba"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Név"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Méret"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Módosítva"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 mappa"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} mappa"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 fájl"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} fájl"
 
diff --git a/l10n/hu_HU/files_encryption.po b/l10n/hu_HU/files_encryption.po
index 643b0404816a55811ce9a01a9c9f5d2ece8d3470..1daf966e90d5f2d0ebaa723de48345e98ca8a41d 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 bc36606bcabb8b220f7877cc68b129279a5e07d2..26b1d2e455db63db4e5524250cb12a5444f5a675 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 66718ac0b98a1476b8054f26f8acf77e9ad21896..bc1e33cad008cad819c66c243b534f16afe09ad8 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 aa6a6bb38b425670006654a00a3f12d3347b5255..160a54c12c13466654bf20ee0b7a2cba385923b7 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 dc3f7965f27a4aabee25d7c628b436ab04d537ed..be74cef5361ce62d832f385d64ac85cb18514a6c 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 3eae903f150757f0c5cfcd6b35cd34bdf9a330ea..c31be35ab08d80884fe5e7b26ff662309b90a132 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Adam Toth <adazlord@gmail.com>, 2013
 # Laszlo Tornoci <torlasz@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -59,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ő"
 
@@ -137,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"
 
@@ -181,7 +182,7 @@ msgid ""
 "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 "Az adatkönytára és az itt levő fájlok valószínűleg elérhetők az internetről. Az ownCloud által beillesztett .htaccess fájl nem működik. Nagyon fontos, hogy a webszervert úgy konfigurálja, hogy az adatkönyvtár nem legyen közvetlenül kívülről elérhető, vagy az adatkönyvtárt tegye a webszerver dokumentumfáján kívülre."
+msgstr "Az adatkönytára és az itt levő fájlok valószínűleg elérhetők az internetről. Az ownCloud által beillesztett .htaccess fájl nem működik. Nagyon fontos, hogy a webszervert úgy konfigurálja, hogy az adatkönyvtár ne legyen közvetlenül kívülről elérhető, vagy az adatkönyvtárt tegye a webszerver dokumentumfáján kívülre."
 
 #: templates/admin.php:29
 msgid "Setup Warning"
@@ -206,7 +207,7 @@ msgstr "A 'fileinfo' modul hiányzik"
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
-msgstr "A 'fileinfo' PHP modul hiányzik. Erősen javasolt ennek a modulnak az telepítése, ha az ember jó eredményt szeretne a MIME-típusok felismerésében."
+msgstr "A 'fileinfo' PHP modul hiányzik. Erősen javasolt ennek a modulnak a telepítése a MIME-típusok felismerésének eredményessé tételéhez."
 
 #: templates/admin.php:58
 msgid "Locale not working"
@@ -325,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 "
@@ -339,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"
 
@@ -387,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
 msgid "Login Name"
 msgstr "Bejelentkezési név"
 
@@ -464,34 +465,44 @@ 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 "Adja meg az adatok visszanyeréséhez szükséges jelszót arra az esetre, ha a felhasználók megváltoztatják a jelszavukat"
+
+#: 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:84
+msgid "Username"
+msgstr "Felhasználónév"
+
+#: 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 7cdac13a90d2dea5485c2a3b30b3db4dbf44272c..76b57d1474fba7c04b062eb88a24289e60070c2a 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 e2056a92cafd5c64f9755143b6903ccc71cf746d..1d74be6d3f91bdf5d668b9e7247ac2d97cda7094 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 e738115c1e43b4714c6813bdda144cc03e517bdd..6a1b8e1ec63397c0b6980de3dbd79f66499d2836 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-20 02:37+0200\n"
+"PO-Revision-Date: 2013-06-20 00:37+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: 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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 eb1ce560470a0db368446ccf86caa562af759042..830ee08a2347879c28da2f8afb766f321ef2c808 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr ""
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/hy/files_encryption.po b/l10n/hy/files_encryption.po
index a16e27d574b2426a99de18a5d3ee53f55d8e4a81..b71cefd6e0b6a9be0b9235e362b582be1c0226c2 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 fb45b44723a0bbcc392afde909a7a2802b45edfa..b09b8cf248ccfe19040741207ff7aa442b9db0a7 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-03 02:27+0200\n"
+"POT-Creation-Date: 2013-06-26 01:59+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 a784afbf6b3321b99f1c6c3e1aa5519023341179..516a9ae1379c697d8926482ead91c65fedead051 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 74dcd02188eef30788a0ba91b53a1523abd94de0..d78ba4b31e50f9f390c8f826b3a7d4fb6707b91c 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-03 02:27+0200\n"
+"POT-Creation-Date: 2013-06-26 01:59+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 2c73b731876a81b6c75e58cecd06a098d12d261c..d38be332ec50fbad83cc9e3799514c49c1c416fe 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr ""
+
+#: 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 101ab76c34c2176353c5a8be5146ac2720bde3ea..497f2fbc293d94276d8288006accb52a877d6954 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 12ac2f61376c33efa08994b976cdd99f356a2b90..b4c9764d4cae7bdf97910f12ecad52303d0b9b69 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
@@ -216,23 +197,23 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Cancellar"
 
-#: 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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 f95c026aa11b66e8dabb429f9b630562dcb49ced..13c98472dc3b48f3b9cd792f845702153c1791ed 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Error"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Nomine"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Dimension"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Modificate"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/ia/files_encryption.po b/l10n/ia/files_encryption.po
index 37c50e27483802edd10801e53d22e4bd2596e454..1d0604f22559bb2c3a27d474e0d2c3d1bbec1109 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 4971a7cae94d67aecb6c0ee4e5b05d8fa12616d0..f04d0346a5791e9ccc46b9d8b4149d9edd2bca2c 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 19200562667e598f74a6fe465f8c4ea360821d1d..4b3ff1b6caf7ab48f7b365d0f1cd5e2992132d5c 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 6712fe19cae3f17fd157ad0f183dfc5a70719ecb..dbd84ee318fb5db3bc170bd8702b446ed0b5c029 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 6f3e874e137f56651b53c6df932619b96b390d00..9d6bb20c7039fda4dff386e2158a0aa035a454bb 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 e8e884bc8c6f895927d11f3d4a4bdd06608f118d..fe1b763855cdfb69b94b0062c16d736f934ff0aa 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "Nomine de usator"
+
+#: 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 06eda6fd303f475fc57a065583c44124736dfd77..eca8b4b8f6ecb96f0d35fb708cf80443ee541dec 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 a91b0b25c8cb31448ba31d2270ed007531f51417..e9996727a39ebf62a82ab1be0bb58b0f7f196ec7 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 ae8bf811e4e3c470d03d0b90c2c3217d25da7a37..2636b71dfcda2d26aaa2943b24b3d60ff3973b4a 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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."
@@ -216,23 +197,23 @@ msgstr "beberapa tahun lalu"
 msgid "Choose"
 msgstr "Pilih"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Batal"
 
-#: 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 "Ya"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Tidak"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Oke"
 
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 12586133ad5eac1a52c5a32ebf7aa50b10959eeb..7879939ac5a2878cb64dc07ceea2dfda8d46a25c 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr "URL tidak boleh kosong"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nama folder salah. Nama 'Shared' telah digunakan oleh Owncloud."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Galat"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Ukuran"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} folder"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 berkas"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} berkas"
 
diff --git a/l10n/id/files_encryption.po b/l10n/id/files_encryption.po
index 573bf66a00a20164f73f597627318a0e43cc84d6..8d29139e9453a789da3a38de112de3a37014688f 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 bc601626910dace7e94c064ac1f747ebee0ce75d..749189c57135f2c46ecb5e16a8a24edc042afab0 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 e0f2c6ca1cd414069534c98f8dc59819240ce7e1..be8fb9a574f04d4912d10ec4db5b7eaff50b04b1 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 feac24537213922edadcef9a414798e80684732a..f4afa3dfdbc43069bc8d826c54b0de9e1932b5cf 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 9e263fa8896945ef5457ff6cd486cc9d4d86d159..9e877f02f3ce695ea3fdb6845dd0efbb50e5a0ab 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 1b000f8b87815b48b561237b315fa2c0c2f2583c..40f8eedd3fbf7aee6983a228a15a824a01fb13a4 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr "Nama Masuk"
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "Nama pengguna"
+
+#: 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 bf1a1d3f440f3f7c54df23e5fa893551800e3adf..a46f1e833eedd20ffb25f1d7906936518f555750 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 f4b9d4b50e5f31c548d7cc4003cb2de4ceb04bf8..b411106f5f664f161a5387adc0e5a001676424fd 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 cb3a337262cffecb0904abd52724da7989177304..330ad870c16878fdac017701851753d70342938e 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Magnus Magnusson <maggiymir@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -19,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."
@@ -216,23 +198,23 @@ msgstr "einhverjum árum"
 msgid "Choose"
 msgstr "Veldu"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Hætta við"
 
-#: 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 "Já"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Nei"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Í lagi"
 
@@ -259,7 +241,7 @@ msgstr "Umbeðina skráin {file} ekki tiltæk!"
 
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
-msgstr ""
+msgstr "Deilt"
 
 #: js/share.js:90
 msgid "Share"
@@ -390,9 +372,9 @@ msgstr ""
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "Uppfærslan heppnaðist. Beini þér til ownCloud nú."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "endursetja ownCloud lykilorð"
 
@@ -420,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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Endursetja lykilorð"
 
@@ -468,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"
@@ -560,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 ""
+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á"
 
@@ -603,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 89771c7ed56e6db963984b5531917782c842b32a..34340946f1ad7b1634acbea802e34f3586611351 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr "Vefslóð má ekki vera tóm."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Óleyfilegt nafn á möppu. Nafnið 'Shared' er frátekið fyrir Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Villa"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Nafn"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Stærð"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Breytt"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 mappa"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} möppur"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 skrá"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} skrár"
 
diff --git a/l10n/is/files_encryption.po b/l10n/is/files_encryption.po
index 1d993ab33690f0b4e2af41a96e233b40868e938b..7ef3d1da8e8976d5b4b9f5aa674aab1b647a711a 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 0cff6001507b95f8bbc056fc54fc7104947e79da..573c7054e9c8fa57274b99b2e239767d62f1e442 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 aba9b4e8da28671544edb6ed2afbff71b3f24090..b5018ef31a5009d46c7f0ed61ae142dc427cbb9e 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 ef4d5da4a6e6100e905d900c393fd72eea368209..1ab495a8a0427788f4d711e8f75687d2ffb9c642 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 fdb277e7664673ee0ee6a998f4614972e63af333..6ca4b051a2a1f1cc3f76bc7471ad9257c9b1eb0a 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 a70339dd89c8f8ca3eb6ff82f69f4e3bb7d395cd..92852949b2c4d2955ef83b55cf0c3fc5c34e1da1 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/settings.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Magnus Magnusson <maggiymir@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -58,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"
 
@@ -102,7 +103,7 @@ msgstr "Virkja"
 
 #: js/apps.js:55
 msgid "Please wait...."
-msgstr ""
+msgstr "Andartak...."
 
 #: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
 msgid "Error"
@@ -110,7 +111,7 @@ msgstr "Villa"
 
 #: js/apps.js:90
 msgid "Updating...."
-msgstr ""
+msgstr "Uppfæri..."
 
 #: js/apps.js:93
 msgid "Error while updating app"
@@ -118,7 +119,7 @@ msgstr ""
 
 #: js/apps.js:96
 msgid "Updated"
-msgstr ""
+msgstr "Uppfært"
 
 #: js/personal.js:118
 msgid "Saving..."
@@ -126,7 +127,7 @@ msgstr "Er að vista ..."
 
 #: js/users.js:47
 msgid "deleted"
-msgstr ""
+msgstr "eytt"
 
 #: js/users.js:47
 msgid "undo"
@@ -136,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"
 
@@ -324,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 "
@@ -338,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"
 
@@ -386,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 ""
+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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +464,44 @@ 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:84
+msgid "Username"
+msgstr "Notendanafn"
+
+#: 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 42655e49061f704d2605721258233593540af86b..1d4fbf8f8d99deead41c07f369fb02349fd96525 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Magnus Magnusson <maggiymir@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,7 +52,7 @@ msgstr ""
 
 #: js/settings.js:83
 msgid "Keep settings?"
-msgstr ""
+msgstr "Geyma stillingar ?"
 
 #: js/settings.js:97
 msgid "Cannot add server configuration"
@@ -412,7 +413,7 @@ msgstr ""
 
 #: templates/settings.php:111
 msgid "Test Configuration"
-msgstr ""
+msgstr "Prúfa uppsetningu"
 
 #: templates/settings.php:111
 msgid "Help"
diff --git a/l10n/is/user_webdavauth.po b/l10n/is/user_webdavauth.po
index 6daf7cdbf02fba8cfdfaabe59bb6cef75ac57dab..d6a3dc156d8c334f081d6cc5d934ea022f7426af 100644
--- a/l10n/is/user_webdavauth.po
+++ b/l10n/is/user_webdavauth.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Magnus Magnusson <maggiymir@gmail.com>, 2013
 # sveinn <sveinng@gmail.com>, 2012
 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: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +21,11 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "WebDAV Authentication"
-msgstr ""
+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 5c47ff5fa6879b66b19370990ef0ae3d92a1d1ab..6a3e978763e9909dfe2f44676c914f7a59643a83 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -3,13 +3,14 @@
 # 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -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 ha condiviso »%s« con te"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -217,23 +199,23 @@ msgstr "anni fa"
 msgid "Choose"
 msgstr "Scegli"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Annulla"
 
-#: 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 "Errore durante il caricamento del modello del selezionatore di file"
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Sì"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "I file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà ripristinata. Se non sei sicuro, per favore contatta l'amministratore prima di proseguire. Vuoi davvero continuare?"
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "Sì, voglio davvero ripristinare la mia password adesso"
+
+#: lostpassword/templates/lostpassword.php:27
 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\nSaluti!"
+
+#: 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>Saluti!"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "precedente"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 87ac3c24631d1981c56a6c44882987190e4cacf0..fcdf9ed4491fde23b3ac1c4dc0bca29e4a019883 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -184,35 +184,35 @@ msgstr "L'URL non può essere vuoto."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nome della cartella non valido. L'uso di 'Shared' è riservato da ownCloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Errore"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Dimensione"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Modificato"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 cartella"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} cartelle"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 file"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} file"
 
diff --git a/l10n/it/files_encryption.po b/l10n/it/files_encryption.po
index d4916e8b50e6c7b0d0de806117537b527379754f..910a7ef89c8b5b96b87c6034eb92c89c720ca5e1 100644
--- a/l10n/it/files_encryption.po
+++ b/l10n/it/files_encryption.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# idetao <marcxosm@gmail.com>, 2013
+# polxmod <paolo.velati@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"
+"POT-Creation-Date: 2013-06-24 02:01+0200\n"
+"PO-Revision-Date: 2013-06-23 11:37+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"
@@ -44,61 +46,128 @@ 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 ottenere nuovamente l'accesso ai file."
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr "Il modulo PHP OpenSSL non è installato."
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr "Chiedi all'amministratore del server di installare il modulo. Per ora la crittografia è disabilitata."
+
 #: 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 nelle tue"
+
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr "Abilita la chiave di recupero (permette di recuperare i file utenti in caso di perdita della password):"
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
-msgstr "Password di ripristino dell'account"
+#: templates/settings-admin.php:14
+msgid "Recovery key password"
+msgstr "Password della chiave di recupero"
 
-#: 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
-msgid "Change encryption passwords recovery key:"
-msgstr "Cambia la chiave di ripristino delle password di cifratura:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr "Cambia la password della chiave di recupero:"
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
-msgstr "Vecchia password di ripristino dell'account"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
+msgstr "Vecchia password della chiave di recupero"
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
-msgstr "Nuova password di ripristino dell'account"
+#: templates/settings-admin.php:48
+msgid "New Recovery key password"
+msgstr "Nuova password della chiave di recupero"
 
-#: 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 accesso:"
+
+#: 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 accesso."
+
+#: 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 "Vecchia password di accesso"
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr "Password di accesso attuale"
+
+#: 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 ripristino 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 "L'abilitazione di questa opzione ti consentirà di accedere nuovamente ai file cifrati in caso di perdita della password"
 
-#: 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 912c686bb8197cf0c0a631405ffed13ecd0bd844..cf8defcbfffa5d9ad43a0e55e8692cb6eb5d6ecc 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 49f2233620b0bd6293240aa61cb4564071b23b15..579178888ec6138c2a16a5a7e8ffeeb0a8f3c53d 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 d0590c78c7fc295d7790b19024a3b74bbdf182da..a3c37675febbd2e237d14b2fd74bc469a54f5984 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 e704f319f13dd6f41fd1218347a9de7bdcb9d6c7..ef76904aae0e4980e8ab25b57a3cd6dbf8d84ec7 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 b3531ea04b0692324829d44520b08d115ad7b333..78802e5f8aaf96bc097f2c3ce070094f5a7bb633 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Francesco Apruzzese <cescoap@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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 +60,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 +138,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 +326,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 +340,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 +388,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
 msgid "Login Name"
 msgstr "Nome utente"
 
@@ -464,34 +465,44 @@ 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:84
+msgid "Username"
+msgstr "Nome utente"
+
+#: 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 01e4970a27d3359ad6da96011042dec594f76b36..7d3a36edcd4ab4fb6a3efd038d76c96149fdde8f 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 342564faf720c0b97cc7b0c7ee83e52d1d3ea132..78c08a701504baa68ccfc1d9ff06ea5b97f63f37 100644
--- a/l10n/it/user_webdavauth.po
+++ b/l10n/it/user_webdavauth.po
@@ -3,13 +3,14 @@
 # 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"
+"POT-Creation-Date: 2013-06-20 02:37+0200\n"
+"PO-Revision-Date: 2013-06-19 06:39+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"
@@ -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 5cd2d7c36f13acc2066585717a6b1d072d8ce037..486239368ecd232ca3b6478482880fa2373ffb38 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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."
@@ -217,23 +199,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 "OK"
 
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "ファイルが暗号化されています。復旧キーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかよくわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？"
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "はい、今すぐパスワードをリセットします。"
+
+#: lostpassword/templates/lostpassword.php:27
 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 f18a6daef91589735778ca30af509194ead67a78..2a02df7abff7af92aad193d57961de2e5c2f61d1 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -184,35 +184,35 @@ msgstr "URLは空にできません。"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "無効なフォルダ名です。'Shared' の利用は ownCloud が予約済みです。"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "エラー"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "名前"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "サイズ"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "変更"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 フォルダ"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} フォルダ"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 ファイル"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} ファイル"
 
diff --git a/l10n/ja_JP/files_encryption.po b/l10n/ja_JP/files_encryption.po
index 218b16a00e60261d349d6ff1a5016d51f407c82e..7e5b441953bae8e3989b659b9f478c5c3889d8cc 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-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10:17+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,128 @@ 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 "秘密鍵が有効ではありません。パスワードが外部から変更された恐れがあります。。個人設定で秘密鍵のパスワードを更新して、ファイルへのアクセス権を奪還できます。"
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr "PHPのモジュール OpenSSLがインストールされていません。"
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr "サーバーの管理者にモジュールのインストールを頼んでください。さしあたり暗号化アプリは無効化されました。"
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "保存中..."
 
+#: 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 "暗号化パスワードの復旧キーを有効にする(復旧キーを共有することを許可):"
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr "復旧キーを有効化 (万一パスワードを亡くした場合もユーザーのファイルを回復できる):"
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
-msgstr "復旧アカウントのパスワード"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
-msgstr "復旧キーの暗号化パスワードを変更:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr "復旧キーのパスワードを変更:"
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
-msgstr "古い復旧アカウントのパスワード"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
+msgstr "古い復旧キーのパスワード"
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
-msgstr "新しい復旧アカウントのパスワード"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 df05798dbd0674a52e910a245cde461dfd8c73b5..9641d4ea4c10c54ad4b962a986471461334c77c1 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 9205b518b17c1e0ba0a666e8429cdde6fc9f2cb3..2ed082766ac055ff4af5afe36cc25eac15d2b7eb 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 c90517e4d2b3f88d4bb9cc6057b947770d85c8a9..929e166861b3e43b90a35eb8d4fbbea78071994f 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 830bc082d4b7595920a7c51d15f09f2b6ceb0750..00e48278dd6c93002718f6bbc3b45b01ba698d59 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 6b990ab4951bead6d8d8d478100c843105abbd30..7a5ee41ff87bb1e72c2df820ebdda5d936371419 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr "ログイン名"
 
@@ -465,34 +466,44 @@ 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:84
+msgid "Username"
+msgstr "ユーザー名"
+
+#: 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 648af63c11a18fd127a26c6b44b40b69f306b33a..f273abf31cfb8fb6cc4484f5709f0b2db538263d 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 9db2784888df7e417392d0c9347ef48a72a7bbc0..a72b73812449fc87fdda1fb308c2c57f20281e88 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 fc467e8e09f8ab8dae49086a925d4395f4a5c4b8..5ebd626b3f14e7f648a5793b29af0ef50373cede 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-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10: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"
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 4a2db5dd214eddfcd3255716a2a04274f216a7ad..7e0a6087cb1b3242815a8c8f53684b3da84de072 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr ""
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/ka/files_encryption.po b/l10n/ka/files_encryption.po
index 12883dff6471a6bedcd0479b0ddd9fc756e92a41..d44c0d8e244aad0b43362e2f3993acce22a5d0d4 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 53dd73051d06c3e9fef868a140af1e2e5de57826..2c43aa9d884fa4a3e963c7ac9eafb8d3d7fca765 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 fe9f5ba85c54637c4565d9dc84fd56acc54be53c..33cd23090ee091dacabbb4c7755cc5ffa47bdd88 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-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10: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"
@@ -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:105
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:108
+#: 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:68
+#: templates/personal.php:74
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:96
+#: 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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr ""
+
+#: 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_ldap.po b/l10n/ka/user_ldap.po
index d171be00d72574fee1306d1634c3db2b8547a5c4..43c61e51c4cbc8e7a55a2543c9934934d770c7af 100644
--- a/l10n/ka/user_ldap.po
+++ b/l10n/ka/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-06-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ka/user_webdavauth.po b/l10n/ka/user_webdavauth.po
index 81c256549525ade1d31ea0b64d32718ab565a0ca..35f97470b15bc713387b23d6d5380f79036d46ab 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 94b9fc0e81d5d5a84e82b5c5c7321621df3573cf..f71135a40480c065b592ef236c05d47e26f6271c 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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."
@@ -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 "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 2b820d85a11b36945a26a5931e584e199a379598..246c991905570d999787d4ab2e09a10ef8a1c441 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr "URL არ შეიძლება იყოს ცარიელი."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "დაუშვებელი ფოლდერის სახელი.  'Shared'–ის გამოყენება რეზერვირებულია Owncloud–ის მიერ"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "შეცდომა"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "სახელი"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "ზომა"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "შეცვლილია"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 საქაღალდე"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} საქაღალდე"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 ფაილი"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} ფაილი"
 
diff --git a/l10n/ka_GE/files_encryption.po b/l10n/ka_GE/files_encryption.po
index d2b48f7eeb99d8ed59db45d3618443e5dfdba435..97e5edec509315bd72d0f4559b540cf458196daf 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "შენახვა..."
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 7dac10dfcea4b8e9d1f5c1630075b50f936e70dd..6b5d02a2118368437aeab84319a476554aa38137 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 6d12ca057519c698ac1ccb7adc926b93a0035de3..aee96750929dabbfe58767c77c09d5f0d5040ef7 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 d7d7fcb490b19df9d980ca38b754217356a01b09..f7a8d12a9541d7e01d015af8a633786109a62adb 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 e38755c8c8cd7e4c87b4ca9fe005c0552fede828..a9416312adbf1a5d9daa5901df816f01c7da3114 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 f02a499b093611f02120c59b847a5f1a97e72fdd..db3f481b5512f20f8b7613e230ba029c7d52a40f 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr "მომხმარებლის სახელი"
 
@@ -464,34 +464,44 @@ 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:84
+msgid "Username"
+msgstr "მომხმარებლის სახელი"
+
+#: 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 01096db8152a05f42ca23ba048c65c98ee4c3daa..4326c97a24695c27aabc810c73283613ec7de28f 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 275948740f4dd1c268bf4ba5ea6040f841a07960..88af8f6bf4194e7ba66f266556ebb1194bf4b704 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 d5e7454d04e082427f84acd6d5f8544257c24dee..bd955c14a2f57d0ad5fe25406fd9ef645c0fb6a6 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-20 02:37+0200\n"
+"PO-Revision-Date: 2013-06-20 00:37+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: 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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 dda2e54fa162be857fd40e113229c00fe6e97594..1cd49209b76ccb5b6ff8a8ae55b3f1c7e0a136e4 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 a2eded06e4ee0e30cf57c5e8110b98015aeba073..f0d51d40c7ef3dac6ceecba56b34e49df99ccc35 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 899150546d3eaf57cf0315927b311ea444860d41..27c2897d6edc9739193638337dc62f08a46d35b7 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-20 02:37+0200\n"
+"PO-Revision-Date: 2013-06-20 00:37+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\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:105
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:108
+#: 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:68
+#: templates/personal.php:74
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:96
+#: 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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr ""
+
+#: 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 771cd4f87ee1a94fb8a43c4c2cacc99d9bcea0fd..535cabb87b6e000d58ff08597fcca286f935ccb6 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 438b13e0d2efc92e8ba5f3236c9b86e8a25ecc10..1a06f9ff89aa3e36b5b5c88dd2b0246020c58178 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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."
@@ -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 "업데이트가 실패하였습니다. 이 문제를 <a href=\"https://g
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "업데이트가 성공하였습니다. ownCloud로 돌아갑니다."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 d716be12d328b5b3406ccec7b81d50a7e9427285..a74387a3f444d523cf11326a328557e032590061 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -185,35 +185,35 @@ msgstr "URL을 입력해야 합니다."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "폴더 이름이 유효하지 않습니다. "
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "오류"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "이름"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "크기"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "수정됨"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "폴더 1개"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "폴더 {count}개"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "파일 1개"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "파일 {count}개"
 
diff --git a/l10n/ko/files_encryption.po b/l10n/ko/files_encryption.po
index 4a5fd3c1fc2d0084c82a58c0541334ef3c4df7dc..00a6031e87b61ea83a54e0db22bca2b081eef7f6 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "저장 중..."
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 ce2cfcc9148e29c85ec4598b21e1847326884271..0606fb0befd11e76956a42f484973de6fe0cb664 100644
--- a/l10n/ko/files_external.po
+++ b/l10n/ko/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Shinjo Park <kde@peremen.name>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+0000\n"
+"Last-Translator: Shinjo Park <kde@peremen.name>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\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>경고:</b> PHP Curl 지원이 비활성화되어 있거나 설치되지 않았습니다. 다른 ownCloud, WebDAV, Google 드라이브 공유를 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오."
 
 #: templates/settings.php:3
 msgid "External Storage"
@@ -67,7 +68,7 @@ msgstr "폴더 이름"
 
 #: templates/settings.php:10
 msgid "External storage"
-msgstr ""
+msgstr "외부 저장소"
 
 #: templates/settings.php:11
 msgid "Configuration"
@@ -83,7 +84,7 @@ msgstr "적용 가능"
 
 #: templates/settings.php:33
 msgid "Add storage"
-msgstr ""
+msgstr "저장소 추가"
 
 #: templates/settings.php:90
 msgid "None set"
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index 3e8a2238f145d0c05d6fd55a7a143807d346be98..b9ed8f63e2bf886a306a17abf8db22d7eb48db49 100644
--- a/l10n/ko/files_sharing.po
+++ b/l10n/ko/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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+0000\n"
+"Last-Translator: Shinjo Park <kde@peremen.name>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\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/ko/files_trashbin.po b/l10n/ko/files_trashbin.po
index c35e4b4537492d21a082f8570a73dd5370c61935..2ae1c30a58a9817dd44008ccb4259bac42bb1bdb 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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_versions.po b/l10n/ko/files_versions.po
index ce0e200f0ba0a561749aff22cfd54bef9241cb19..f92a63026989a27f73dff720be0a0e33a409319b 100644
--- a/l10n/ko/files_versions.po
+++ b/l10n/ko/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Shinjo Park <kde@peremen.name>, 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:28+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-20 02:37+0200\n"
+"PO-Revision-Date: 2013-06-19 08:50+0000\n"
+"Last-Translator: Shinjo Park <kde@peremen.name>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,12 +25,12 @@ msgstr "되돌릴 수 없습니다: %s"
 
 #: history.php:40
 msgid "success"
-msgstr "완료"
+msgstr "성공"
 
 #: history.php:42
 #, php-format
 msgid "File %s was reverted to version %s"
-msgstr "파일 %s를 버전 %s로 변경하였습니다."
+msgstr "파일 %s을(를) 버전 %s(으)로 되돌림"
 
 #: history.php:49
 msgid "failure"
@@ -38,20 +39,20 @@ msgstr "실패"
 #: history.php:51
 #, php-format
 msgid "File %s could not be reverted to version %s"
-msgstr "파일 %s를 버전 %s로 되돌리지 못했습니다."
+msgstr "파일 %s을(를) 버전 %s(으)로 되돌리지 못했음"
 
 #: history.php:69
 msgid "No old versions available"
-msgstr "오래된 버전을 사용할 수 없습니다"
+msgstr "오래된 버전을 사용할 수 없음"
 
 #: history.php:74
 msgid "No path specified"
-msgstr "경로를 알수 없습니다."
+msgstr "경로가 지정되지 않았음"
 
 #: js/versions.js:6
 msgid "Versions"
-msgstr "버젼"
+msgstr "버전"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "변경 버튼을 클릭하여 이전 버전의 파일로 변경할 수 있습니다."
+msgstr "변경 단추를 눌러 이전 버전의 파일로 되돌릴 수 있습니다"
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index 18c0671fc962e9b555a084825fc875ed27b7e71a..8702193d42575fed350116f79d1128efb77a89fc 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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,79 +113,79 @@ 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 ""
+msgstr "WebDAV 인터페이스가 제대로 작동하지 않습니다. 웹 서버에서 파일 동기화를 사용할 수 있도록 설정이 제대로 되지 않은 것 같습니다."
 
-#: setup.php:868
+#: setup.php:871
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오."
 
 #: template.php:113
 msgid "seconds ago"
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index b546ec16d2e46ade3ea79fbbe6f302571cb8760a..640e2b716b8ea22b11ca691a3ffb7d8122132121 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Shinjo Park <kde@peremen.name>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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,19 +29,19 @@ msgstr "인증 오류"
 
 #: ajax/changedisplayname.php:31
 msgid "Your display name has been changed."
-msgstr ""
+msgstr "표시 이름이 변경되었습니다."
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
-msgstr ""
+msgstr "표시 이름을 변경할 수 없음"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
-msgstr "그룹이 이미 존재합니다."
+msgstr "그룹이 이미 존재함"
 
 #: ajax/creategroup.php:19
 msgid "Unable to add group"
-msgstr "그룹을 추가할 수 없습니다."
+msgstr "그룹을 추가할 수 없음"
 
 #: ajax/enableapp.php:11
 msgid "Could not enable app. "
@@ -56,15 +57,15 @@ msgstr "잘못된 이메일 주소"
 
 #: ajax/removegroup.php:13
 msgid "Unable to delete group"
-msgstr "그룹을 삭제할 수 없습니다."
+msgstr "그룹을 삭제할 수 없음"
 
-#: ajax/removeuser.php:24
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
-msgstr "사용자를 삭제할 수 없습니다."
+msgstr "사용자를 삭제할 수 없음."
 
 #: ajax/setlanguage.php:15
 msgid "Language changed"
-msgstr "언어가 변경되었습니다"
+msgstr "언어가 변경됨"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
@@ -72,25 +73,25 @@ msgstr "잘못된 요청"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr "관리자 자신을 관리자 그룹에서 삭제할 수 없습니다"
+msgstr "관리자 자신을 관리자 그룹에서 삭제할 수 없음"
 
 #: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr "그룹 %s에 사용자를 추가할 수 없습니다."
+msgstr "그룹 %s에 사용자를 추가할 수 없음"
 
 #: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr "그룹 %s에서 사용자를 삭제할 수 없습니다."
+msgstr "그룹 %s에서 사용자를 삭제할 수 없음"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr ""
+msgstr "앱을 업데이트할 수 없습니다."
 
 #: js/apps.js:30
 msgid "Update to {appversion}"
-msgstr ""
+msgstr "버전 {appversion}(으)로 업데이트"
 
 #: js/apps.js:36 js/apps.js:76
 msgid "Disable"
@@ -102,7 +103,7 @@ msgstr "사용함"
 
 #: js/apps.js:55
 msgid "Please wait...."
-msgstr ""
+msgstr "기다려 주십시오...."
 
 #: js/apps.js:59 js/apps.js:71 js/apps.js:80 js/apps.js:93
 msgid "Error"
@@ -110,15 +111,15 @@ msgstr "오류"
 
 #: js/apps.js:90
 msgid "Updating...."
-msgstr ""
+msgstr "업데이트 중...."
 
 #: js/apps.js:93
 msgid "Error while updating app"
-msgstr ""
+msgstr "앱을 업데이트하는 중 오류 발생"
 
 #: js/apps.js:96
 msgid "Updated"
-msgstr ""
+msgstr "업데이트됨"
 
 #: js/personal.js:118
 msgid "Saving..."
@@ -126,44 +127,44 @@ msgstr "저장 중..."
 
 #: js/users.js:47
 msgid "deleted"
-msgstr "삭제"
+msgstr "삭제됨"
 
 #: js/users.js:47
 msgid "undo"
-msgstr "되돌리기"
+msgstr "실행 취소"
 
 #: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+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 "삭제"
 
 #: js/users.js:269
 msgid "add group"
-msgstr ""
+msgstr "그룹 추가"
 
 #: js/users.js:428
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "올바른 사용자 이름을 입력해야 함"
 
 #: js/users.js:429 js/users.js:435 js/users.js:450
 msgid "Error creating user"
-msgstr ""
+msgstr "사용자 생성 오류"
 
 #: js/users.js:434
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "올바른 암호를 입력해야 함"
 
 #: personal.php:35 personal.php:36
 msgid "__language_name__"
@@ -190,26 +191,26 @@ msgstr "설정 경고"
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr ""
+msgstr "WebDAV 인터페이스가 제대로 작동하지 않습니다. 웹 서버에서 파일 동기화를 사용할 수 있도록 설정이 제대로 되지 않은 것 같습니다."
 
 #: templates/admin.php:33
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
+msgstr "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오."
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "모듈 'fileinfo'가 없음"
 
 #: 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 ""
+msgstr "PHP 모듈 'fileinfo'가 존재하지 않습니다. MIME 형식 감지 결과를 향상시키기 위하여 이 모듈을 활성화하는 것을 추천합니다."
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr ""
+msgstr "로캘이 작동하지 않음"
 
 #: templates/admin.php:63
 #, php-format
@@ -217,11 +218,11 @@ 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 ""
+msgstr "ownCloud 서버의 시스템 로캘을 %s(으)로 설정할 수 없습니다. 파일 이름에 특정한 글자가 들어가 있는 경우 문제가 발생할 수 있습니다. %s을(를) 지원하기 위해서 시스템에 필요한 패키지를 설치하는 것을 추천합니다."
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr ""
+msgstr "인터넷에 연결할 수 없음"
 
 #: templates/admin.php:78
 msgid ""
@@ -231,7 +232,7 @@ msgid ""
 "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 ""
+msgstr "ownCloud 서버에서 인터넷에 연결할 수 없습니다. 외부 저장소 마운트, 업데이트 알림, 외부 앱 설치 등이 작동하지 않을 것입니다. 외부에서 파일에 접근하거나, 알림 이메일을 보내지 못할 수도 있습니다. ownCloud의 모든 기능을 사용하려면 이 서버를 인터넷에 연결하는 것을 추천합니다."
 
 #: templates/admin.php:92
 msgid "Cron"
@@ -239,74 +240,74 @@ msgstr "크론"
 
 #: templates/admin.php:101
 msgid "Execute one task with each page loaded"
-msgstr ""
+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 ""
+msgstr "cron.php가 webcron 서비스에 등록되어 있습니다. HTTP를 통하여 1분마다 ownCloud 루트에서 cron.php 페이지를 불러옵니다."
 
 #: 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 ""
+msgstr "시스템 cron 서비스를 사용합니다. 시스템 cronjob을 사용하여 ownCloud 폴더의 cron.php 파일을 1분마다 불러옵니다."
 
 #: templates/admin.php:128
 msgid "Sharing"
-msgstr ""
+msgstr "공유"
 
 #: templates/admin.php:134
 msgid "Enable Share API"
-msgstr ""
+msgstr "공유 API 사용하기"
 
 #: templates/admin.php:135
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "앱에서 공유 API를 사용할 수 있도록 허용"
 
 #: templates/admin.php:142
 msgid "Allow links"
-msgstr ""
+msgstr "링크 허용"
 
 #: templates/admin.php:143
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "사용자가 개별 항목의 링크를 공유할 수 있도록 허용"
 
 #: templates/admin.php:150
 msgid "Allow resharing"
-msgstr ""
+msgstr "재공유 허용"
 
 #: templates/admin.php:151
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "사용자에게 공유된 항목을 다시 공유할 수 있도록 허용"
 
 #: templates/admin.php:158
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "누구나와 공유할 수 있도록 허용"
 
 #: templates/admin.php:161
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "사용자가 속해 있는 그룹의 사용자와만 공유할 수 있도록 허용"
 
 #: templates/admin.php:168
 msgid "Security"
-msgstr ""
+msgstr "보안"
 
 #: templates/admin.php:181
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "HTTPS 강제 사용"
 
 #: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "클라이언트가 ownCloud에 항상 암호화된 연결로 연결하도록 강제합니다."
 
 #: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr ""
+msgstr "SSL 강제 사용 설정을 변경하려면 ownCloud 인스턴스에 HTTPS로 연결하십시오."
 
 #: templates/admin.php:195
 msgid "Log"
@@ -324,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 "
@@ -338,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 "앱 추가"
+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 +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 "앱을 이용하여 당신의 파일을 동기화 할 수 있습니다."
+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 "암호 찾기 기능을 사용하려면 이메일 주소를 입력하십시오."
+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에 접속하려면 이 주소를 사용하십시오."
+msgstr "파일 관리자에서 ownCloud에 접속하려면 이 주소를 사용하십시오"
 
-#: templates/users.php:21 templates/users.php:80
+#: templates/users.php:21
 msgid "Login Name"
 msgstr "로그인 이름"
 
@@ -463,34 +464,44 @@ msgstr "로그인 이름"
 msgid "Create"
 msgstr "만들기"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
-msgstr ""
+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:84
+msgid "Username"
+msgstr "사용자 이름"
+
+#: 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 c778c7bcac81c74e42b096622abe051037c147d0..b8c1652f407e0040281daca02fa80d5ffa5e93ca 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 07e03e883858a911f8b438b3d41f4f99579fdac7..73deb90e44b9249c5c9a44ee759942845c0bec5f 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 3efd4cb54c6a4c2f8b89a3c4db3331fbb37fc872..6f028252c5f1da389562c28ab471fb0666d42157 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 1c9a37e3082fe821cd420b6051335132b8cb0a7c..7e56ad50b9fedf77cf3aca5514c6b1e5f29bb0ad 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr "ناونیشانی به‌سته‌ر نابێت به‌تاڵ بێت."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "هه‌ڵه"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "ناو"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/ku_IQ/files_encryption.po b/l10n/ku_IQ/files_encryption.po
index c8090c00e4432c9917d4d4641b683185585e2bf1..5d502c1d272426f3e85ae4eb665a3bc6443f30a0 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "پاشکه‌وتده‌کات..."
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 66f5b470e8466ad446705744c4ac08dccf49f122..59c485719c65cb4911d43621531c65b868c10cc2 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 599e316a48208e5aa35802cff9768736bda9ab0e..430deabcf518959c6b45f591566b30079844660f 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 be6dc8e788fb7fb5302a0ee4d533d56a060eddd8..91e8e03ad688e2c7c96cf492f4c5a862683244e9 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-02 02:01+0200\n"
-"PO-Revision-Date: 2013-06-02 00:02+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 e2f4cbba3991624d05cbf7e4d3e4f2220839560a..42d842557650112e789eaac8cf27996a42074426 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "ناوی به‌کارهێنه‌ر"
+
+#: 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 f49698d4ef6d263dae1a9ffb6f30d56aaa546aa8..bf2b259100df3c48e948af7f4a97ba516e15763d 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 381e788ea49473987a60fc86a1e40c9fb4b72114..14906a0a573077fd1c8da1c6b10411d5dfb74c37 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 cdaaafc10435693a9480e79dabacb9c45ae69cb9..6ed7a21be02c21cb4c9ff31e2bb840f3b67d9d4b 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
@@ -216,23 +197,23 @@ msgstr "Joren hier"
 msgid "Choose"
 msgstr "Auswielen"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Ofbriechen"
 
-#: 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 "Jo"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Nee"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "OK"
 
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 9eded80484030f717f46ac016fd1d63f5d7366ff..87834dbf1b785b7901b7d63e421fdbbef1df4e9a 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Fehler"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Numm"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Gréisst"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Geännert"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/lb/files_encryption.po b/l10n/lb/files_encryption.po
index 304094fcb33bd3053fb3eed4a3759d62c98e2a92..49ea6eea614f66e40fb3a085eb44e4d36e84c472 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 18c7b57b885f36e71a4fa577858e5fb24725e5ba..8a0f12b4a8e208d2134a6df8a811de6604b9c208 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 a780767eb6b9874eaef729a98a0d1caa3e560662..a9c0f94523c5efe8a4bad3b793a4e2731bd4d2f9 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 d6bca58aa1ac43244ffa1dce0de06acb1b067308..ba8b049e877e862acc90f1e4ae88c9dfc4228110 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 77de4f8643fb9a4755e8a11f652d8ce37910b551..60fc60b4e989126172c9acf94c347bcd4701c0f7 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 5fb1196d33f7a43b126169e8e1ceea4d859fb057..47f293f5bbfa1ae046516dda6833d87706b8ffad 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "Benotzernumm"
+
+#: 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 e89f5d783070dfdc7ff07b76ae13dbb369885648..898ef2e3a5905c131c63f29d09ccc06a9de55d87 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 1bceab60dbff5a605bccbfb6d2900a7918e8b081..20d27db5b444be2aabb3c354e095e4e3e8abe2ed 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 23ebebc9ee311b329dade17a71eec2b1b014b1aa..acf0e28b8af38aafe61149d4242ad7c333793657 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Roman Deniobe <rms200x@gmail.com>, 2013
+# fizikiukas <fizikiukas@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: Roman Deniobe <rms200x@gmail.com>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -20,31 +21,12 @@ 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 ""
-
-#: 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
 msgid "Category type not provided."
-msgstr ""
+msgstr "Kategorija nenurodyta."
 
 #: ajax/vcategories/add.php:30
 msgid "No category to add?"
@@ -53,24 +35,24 @@ msgstr "NepridÄ—site jokios kategorijos?"
 #: ajax/vcategories/add.php:37
 #, php-format
 msgid "This category already exists: %s"
-msgstr ""
+msgstr "Å i kategorija jau egzistuoja: %s"
 
 #: 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 ""
+msgstr "Objekto tipas nenurodytas."
 
 #: ajax/vcategories/addToFavorites.php:30
 #: ajax/vcategories/removeFromFavorites.php:30
 #, php-format
 msgid "%s ID not provided."
-msgstr ""
+msgstr "%s ID nenurodytas."
 
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
 msgid "Error adding %s to favorites."
-msgstr ""
+msgstr "Klaida perkeliant %s į jūsų mėgstamiausius."
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
@@ -79,7 +61,7 @@ msgstr "Trynimui nepasirinkta jokia kategorija."
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
 msgid "Error removing %s from favorites."
-msgstr ""
+msgstr "Klaida ištrinant %s iš jūsų mėgstamiausius."
 
 #: js/config.php:34
 msgid "Sunday"
@@ -175,11 +157,11 @@ msgstr "Prieš {count} minutes"
 
 #: js/js.js:721
 msgid "1 hour ago"
-msgstr ""
+msgstr "prieš 1 valandą"
 
 #: js/js.js:722
 msgid "{hours} hours ago"
-msgstr ""
+msgstr "prieš {hours} valandas"
 
 #: js/js.js:723
 msgid "today"
@@ -199,7 +181,7 @@ msgstr "praeitą mėnesį"
 
 #: js/js.js:727
 msgid "{months} months ago"
-msgstr ""
+msgstr "prieš {months} mėnesių"
 
 #: js/js.js:728
 msgid "months ago"
@@ -217,30 +199,30 @@ msgstr "prieš metus"
 msgid "Choose"
 msgstr "Pasirinkite"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Atšaukti"
 
-#: 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 ""
+msgstr "Klaida pakraunant failų naršyklę"
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Taip"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Ne"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Gerai"
 
 #: 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 ""
+msgstr "Objekto tipas nenurodytas."
 
 #: 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
@@ -252,15 +234,15 @@ msgstr "Klaida"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
-msgstr ""
+msgstr "Nenurodytas programos pavadinimas."
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
-msgstr ""
+msgstr "Reikalingas {file} failas nėra įrašytas!"
 
 #: js/share.js:30 js/share.js:45 js/share.js:87
 msgid "Shared"
-msgstr ""
+msgstr "Dalinamasi"
 
 #: js/share.js:90
 msgid "Share"
@@ -304,11 +286,11 @@ msgstr "Slaptažodis"
 
 #: js/share.js:173
 msgid "Email link to person"
-msgstr ""
+msgstr "Nusiųsti nuorodą paštu"
 
 #: js/share.js:174
 msgid "Send"
-msgstr ""
+msgstr "Siųsti"
 
 #: js/share.js:178
 msgid "Set expiration date"
@@ -376,24 +358,24 @@ msgstr "Klaida nustatant galiojimo laikÄ…"
 
 #: js/share.js:604
 msgid "Sending ..."
-msgstr ""
+msgstr "Siunčiama..."
 
 #: js/share.js:615
 msgid "Email sent"
-msgstr ""
+msgstr "Laiškas išsiųstas"
 
 #: 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 ""
+msgstr "Atnaujinimas buvo nesėkmingas. PApie tai prašome pranešti the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud bendruomenei</a>."
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "ownCloud slaptažodžio atkūrimas"
 
@@ -406,11 +388,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 "Nuorodą su jūsų slaptažodžio atkūrimu buvo nusiųsta jums į paštą.<br>Jei jo negausite per atitinkamą laiką, pasižiūrėkite brukalo aplankale.<br> Jei jo ir ten nėra, teiraukitės administratoriaus."
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "Klaida!<br>Ar tikrai jūsų el paštas/vartotojo vardas buvo teisingi?"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
@@ -421,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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Prašyti nustatymo iš najo"
 
@@ -469,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"
@@ -484,11 +493,11 @@ msgstr "Saugumo pranešimas"
 
 #: templates/installation.php:25
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
+msgstr "Jūsų PHP versija yra pažeidžiama prieš NULL Byte ataką (CVE-2006-7243)"
 
 #: templates/installation.php:26
 msgid "Please update your PHP installation to use ownCloud securely."
-msgstr ""
+msgstr "Prašome atnaujinti savo PHP norint naudotis savo ownCloud saugiai."
 
 #: templates/installation.php:32
 msgid ""
@@ -506,14 +515,14 @@ msgstr "Be saugaus atsitiktinių skaičių generatoriaus, piktavaliai gali atsp
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr ""
+msgstr "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess failas neveikia."
 
 #: 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 ""
+msgstr "Norint gauti daugiau informacijos apie tai kaip tinkamai nustatyit savo serverį, prašome perskaityti <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">dokumentaciją</a>."
 
 #: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
@@ -561,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 ""
+msgstr "%s yra prieinama. Gaukite daugiau informacijos apie atnaujinimÄ…."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Atsijungti"
 
@@ -602,6 +607,13 @@ msgstr "Prisijungti"
 
 #: templates/login.php:47
 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
@@ -615,4 +627,4 @@ msgstr "kitas"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
+msgstr "Atnaujinama ownCloud į %s versiją. tai gali šiek tiek užtrukti."
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index b6f58efbe5d3bb2d8f7348908582e91c99a92288..2028ee0aced58d1c60f330a67240b93e4412751c 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# fizikiukas <fizikiukas@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,16 +21,16 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Nepavyko perkelti %s - failas su tokiu pavadinimu jau egzistuoja"
 
 #: ajax/move.php:27 ajax/move.php:30
 #, php-format
 msgid "Could not move %s"
-msgstr ""
+msgstr "Nepavyko perkelti %s"
 
 #: ajax/upload.php:19
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Failai nebuvo įkelti dėl nežinomos priežasties"
 
 #: ajax/upload.php:26
 msgid "There is no error, the file uploaded with success"
@@ -38,7 +39,7 @@ msgstr "Failas įkeltas sėkmingai, be klaidų"
 #: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "Įkeliamas failas yra didesnis nei leidžia upload_max_filesize php.ini faile:"
 
 #: ajax/upload.php:29
 msgid ""
@@ -64,11 +65,11 @@ msgstr "Nepavyko įrašyti į diską"
 
 #: ajax/upload.php:51
 msgid "Not enough storage available"
-msgstr ""
+msgstr "Nepakanka vietos serveryje"
 
 #: ajax/upload.php:83
 msgid "Invalid directory."
-msgstr ""
+msgstr "Neteisingas aplankas"
 
 #: appinfo/app.php:12
 msgid "Files"
@@ -80,7 +81,7 @@ msgstr "Dalintis"
 
 #: js/fileactions.js:126
 msgid "Delete permanently"
-msgstr ""
+msgstr "Ištrinti negrįžtamai"
 
 #: js/fileactions.js:128 templates/index.php:93 templates/index.php:94
 msgid "Delete"
@@ -120,7 +121,7 @@ msgstr "anuliuoti"
 
 #: js/filelist.js:331
 msgid "perform delete operation"
-msgstr ""
+msgstr "ištrinti"
 
 #: js/filelist.js:413
 msgid "1 file uploading"
@@ -128,35 +129,35 @@ msgstr "įkeliamas 1 failas"
 
 #: js/filelist.js:416 js/filelist.js:470
 msgid "files uploading"
-msgstr ""
+msgstr "įkeliami failai"
 
 #: js/files.js:52
 msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' yra neleidžiamas failo pavadinime."
 
 #: js/files.js:56
 msgid "File name cannot be empty."
-msgstr ""
+msgstr "Failo pavadinimas negali būti tuščias."
 
 #: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
-msgstr ""
+msgstr "Neleistinas pavadinimas, '\\', '/', '<', '>', ':', '\"', '|', '?' ir '*' yra neleidžiami."
 
 #: js/files.js:78
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr ""
+msgstr "Jūsų visa vieta serveryje užimta"
 
 #: js/files.js:82
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr ""
+msgstr "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)"
 
 #: js/files.js:231
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr ""
+msgstr "Jūsų atsisiuntimas yra paruošiamas. tai gali užtrukti jei atsisiunčiamas didelis failas."
 
 #: js/files.js:264
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
@@ -164,7 +165,7 @@ msgstr "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai kataloga
 
 #: js/files.js:277
 msgid "Not enough space available"
-msgstr ""
+msgstr "Nepakanka vietos"
 
 #: js/files.js:317
 msgid "Upload cancelled."
@@ -177,51 +178,51 @@ msgstr "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutr
 
 #: js/files.js:486
 msgid "URL cannot be empty."
-msgstr ""
+msgstr "URL negali būti tuščias."
 
 #: js/files.js:491
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Klaida"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Dydis"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Pakeista"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 aplankalas"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} aplankalai"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 failas"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} failai"
 
 #: lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Negalimas aplanko pavadinimas. 'Shared' pavadinimas yra rezervuotas ownCloud"
 
 #: lib/app.php:73
 msgid "Unable to rename file"
-msgstr ""
+msgstr "Nepavyko pervadinti failo"
 
 #: lib/helper.php:11 templates/index.php:18
 msgid "Upload"
@@ -273,11 +274,11 @@ msgstr "Katalogas"
 
 #: templates/index.php:14
 msgid "From link"
-msgstr ""
+msgstr "IÅ¡ nuorodos"
 
 #: templates/index.php:42
 msgid "Deleted files"
-msgstr ""
+msgstr "IÅ¡trinti failai"
 
 #: templates/index.php:48
 msgid "Cancel upload"
@@ -285,7 +286,7 @@ msgstr "Atšaukti siuntimą"
 
 #: templates/index.php:54
 msgid "You don’t have write permissions here."
-msgstr ""
+msgstr "Jūs neturite rašymo leidimo."
 
 #: templates/index.php:61
 msgid "Nothing in here. Upload something!"
@@ -319,4 +320,4 @@ msgstr "Å iuo metu skenuojama"
 
 #: templates/upgrade.php:2
 msgid "Upgrading filesystem cache..."
-msgstr ""
+msgstr "Atnaujinamas sistemos kešavimas..."
diff --git a/l10n/lt_LT/files_encryption.po b/l10n/lt_LT/files_encryption.po
index 8d1d63c95a12c4a39458bb8963d50dca7a858dbf..eb602e23d5c012276c1ec6d0a8461d8377e55275 100644
--- a/l10n/lt_LT/files_encryption.po
+++ b/l10n/lt_LT/files_encryption.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# fizikiukas <fizikiukas@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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -19,85 +20,152 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Atkūrimo raktas sėkmingai įjungtas"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Neišėjo įjungti jūsų atkūrimo rakto. Prašome jį patikrinti!"
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Atkūrimo raktas sėkmingai išjungtas"
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Neišėjo išjungti jūsų atkūrimo rakto. Prašome jį patikrinti!"
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Slaptažodis sėkmingai pakeistas"
 
 #: ajax/changeRecoveryPassword.php:51
 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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 ""
+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 ""
+msgstr "IÅ¡jungta"
 
-#: templates/settings-admin.php:32
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
+msgstr "Pakeisti slaptažodį"
+
+#: 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 "Failų atstatymo nustatymai pakeisti"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
-msgstr ""
+msgstr "Neišėjo atnaujinti failų atkūrimo"
diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po
index f84b40b00656b98260fe1feb0e6235f1852af59c..ba74135ddaf706fbbf97f8fd81da132c91b5a066 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 9a9fe7aa1a0480efa41306c9f4f22a87707816fd..1bc412436feddd9663afb0c5e4e81b3647d0ef6c 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/files_sharing.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# fizikiukas <fizikiukas@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
@@ -28,12 +29,12 @@ msgstr "IÅ¡saugoti"
 #: templates/public.php:10
 #, php-format
 msgid "%s shared the folder %s with you"
-msgstr ""
+msgstr "%s pasidalino su jumis %s aplanku"
 
 #: templates/public.php:13
 #, php-format
 msgid "%s shared the file %s with you"
-msgstr ""
+msgstr "%s pasidalino su jumis %s failu"
 
 #: templates/public.php:19 templates/public.php:43
 msgid "Download"
@@ -41,8 +42,4 @@ msgstr "Atsisiųsti"
 
 #: templates/public.php:40
 msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:50
-msgid "web services under your control"
-msgstr "jūsų valdomos web paslaugos"
+msgstr "Peržiūra nėra galima"
diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po
index 6b009b4a122cd81f1fd3c0bbfb018be42b47a8eb..195fdcf27ed07cc9da19f3851794b9ab96b26c6e 100644
--- a/l10n/lt_LT/files_trashbin.po
+++ b/l10n/lt_LT/files_trashbin.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# fizikiukas <fizikiukas@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,16 +21,16 @@ msgstr ""
 #: ajax/delete.php:42
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr ""
+msgstr "Nepavyko negrįžtamai ištrinti %s"
 
 #: ajax/undelete.php:42
 #, php-format
 msgid "Couldn't restore %s"
-msgstr ""
+msgstr "Nepavyko atkurti %s"
 
 #: js/trash.js:7 js/trash.js:97
 msgid "perform restore operation"
-msgstr ""
+msgstr "atkurti"
 
 #: js/trash.js:19 js/trash.js:46 js/trash.js:115 js/trash.js:141
 msgid "Error"
@@ -37,11 +38,11 @@ msgstr "Klaida"
 
 #: js/trash.js:34
 msgid "delete file permanently"
-msgstr ""
+msgstr "failą ištrinti negrįžtamai"
 
 #: js/trash.js:123
 msgid "Delete permanently"
-msgstr ""
+msgstr "Ištrinti negrįžtamai"
 
 #: js/trash.js:176 templates/index.php:17
 msgid "Name"
@@ -49,7 +50,7 @@ msgstr "Pavadinimas"
 
 #: js/trash.js:177 templates/index.php:27
 msgid "Deleted"
-msgstr ""
+msgstr "IÅ¡trinti"
 
 #: js/trash.js:186
 msgid "1 folder"
@@ -69,11 +70,11 @@ msgstr "{count} failai"
 
 #: templates/index.php:9
 msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
+msgstr "Nieko nėra. Jūsų šiukšliadėžė tuščia!"
 
 #: templates/index.php:20 templates/index.php:22
 msgid "Restore"
-msgstr ""
+msgstr "Atstatyti"
 
 #: templates/index.php:30 templates/index.php:31
 msgid "Delete"
@@ -81,4 +82,4 @@ msgstr "IÅ¡trinti"
 
 #: templates/part.breadcrumb.php:9
 msgid "Deleted Files"
-msgstr ""
+msgstr "IÅ¡trinti failai"
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index aaa943f9d4365af22edfb722d67bb01bc15a1ef1..939a04910b21ff5d13f2e59a9f9c1ca594e9d629 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# fizikiukas <fizikiukas@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,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"
 
@@ -83,7 +84,7 @@ msgstr "Žinučių"
 
 #: search/provider/file.php:29
 msgid "Images"
-msgstr ""
+msgstr "PaveikslÄ—liai"
 
 #: setup.php:34
 msgid "Set an admin username."
@@ -113,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 ""
@@ -202,12 +203,12 @@ msgstr "prieš %d minučių"
 
 #: template.php:116
 msgid "1 hour ago"
-msgstr ""
+msgstr "prieš 1 valandą"
 
 #: template.php:117
 #, php-format
 msgid "%d hours ago"
-msgstr ""
+msgstr "prieš %d valandų"
 
 #: template.php:118
 msgid "today"
@@ -229,7 +230,7 @@ msgstr "praeitą mėnesį"
 #: template.php:122
 #, php-format
 msgid "%d months ago"
-msgstr ""
+msgstr "prieš %d mėnesių"
 
 #: template.php:123
 msgid "last year"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 640edcbf5f201ff0efbd2d1ec7523ce3271bfc77..f609ccc38014f847e50c227c1bbeb36cc87ca714 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 ""
+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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "Prisijungimo vardas"
+
+#: 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 92110398949cd6f4f1968fa006d0af199da3de4a..d9934d3d7cb3b65c4a9fb19f16b86f5f497fc36e 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 173f9167f2b25728d9f4ca67d2ba9819574d446f..401e8edc0f3fabb90514d7a4339ff586d133265a 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 4a746cc825860d73030c59b51a9d1d29bcab0709..d89c0e2266c0d2fac87e2d9be1ecdbca0919c811 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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."
@@ -216,23 +197,23 @@ msgstr "gadus atpakaļ"
 msgid "Choose"
 msgstr "Izvēlieties"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: 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 "Jā"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "NÄ“"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Labi"
 
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 61cd8e91c5a3a312c0050be6dd71f50cd86aa9d6..5b5938acad3d29ea80164e39f113d28d20d02c2b 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr "URL nevar būt tukšs."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nederīgs mapes nosaukums. “Koplietots” izmantojums ir rezervēts ownCloud servisam."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Kļūda"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Nosaukums"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Izmērs"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Mainīts"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 mape"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} mapes"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 datne"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} datnes"
 
diff --git a/l10n/lv/files_encryption.po b/l10n/lv/files_encryption.po
index 4d1d0d415bd0c1690e6bcd15f237f7fadf4e0221..16e32493a9aade428b7632472070c408a6fe3d36 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 56e4020ed1bbc83f1c3c2832323359fcbb05366b..e5edb12e98314744775d553567199a5266cf6d61 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 363900d1c5ead9f19f5416c8bdbbb081602b08e4..8575c23006144905da99ca44ce163f3f95dd41af 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 296e6d2c0cd803b132b0677d94457b3680049120..6533f9f9e219228cd42acb18bcbec5dbc456fec9 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 36c289b8fa5a77624a5ddb2fa881787b81093f20..25b9d7cae55e9274215fcfeb819b17a790c1b9ab 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 8ac181d5882ee50dcadb5ba4201b94dfea4721a4..ad414f1eba4d3e61b1f4780c3f6da6e28c754eec 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr "Ierakstīšanās vārds"
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "Lietotājvārds"
+
+#: 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 45460c20e1304c707f42539a2a6ba647b38a877c..4bf9f4e471c6dbb5a16b13e90738671be6420014 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 bc46877310002c92c422d85ed2ee1ed6d741aeb2..cdc12e2a8cec7897e2b6d566e9c4b506e1e14940 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 313e7afe179ef1048ab68ad2098d8b32372e6af8..6a84676919d42a9bb86450e444fb980d481d9606 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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."
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 2a907e8064f383cac94519c9e5ae271e4646011c..f77534ce047d924d639ea950c208ae536f9d945d 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr "Адресата неможе да биде празна."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Грешка"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Големина"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Променето"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} папки"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 датотека"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} датотеки"
 
diff --git a/l10n/mk/files_encryption.po b/l10n/mk/files_encryption.po
index 5ccdc506c2ca4bb5bef6e8ddb996c0f950dd7c8f..f1f693ab9735e6c57ded86266b1d8040a319ef17 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Снимам..."
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 6da9a4c5b4bc6af00fca944a4d770cc6abd22e87..6bb215dc2fb276d52a2e7759e3222fcbbe8f0296 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 1cf38e52a3d70eaec61883eefa614d349c7c3095..d1af74824397a08299d08c933001e2e624ee045f 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 86dfbed28ae1f0edc6a07087297deb7580ac8805..a0b4bc4a1553e16910856d0d1fa2e1e728694dba 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 8465ef142074eeb37c49590f74f4c40d5a9dd840..4cd7f8ed54c18006fd64746d359d0525ce04f985 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 17ecb1aabfaceba12cb2db9c634c519c35ea9956..8391e49a28f4a958b18159f58d569d01d8fbdfd0 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "Корисничко име"
+
+#: 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 04e212b30e4f2db278a084c62d7417f50d599b32..97a0b85713c674abff4c50176ac4896fd2fa295f 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 78f50a5abe44e8796dfe8dd40c2a83d54f121af6..4f39ddca61f626d90ebe55be0dc1dbd77c6f4470 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 e8c1a6bde3fc00feeb83d9e0925a24738447a507..843daf97d54ca2797764fcc62c44c72af95d569f 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
@@ -216,23 +197,23 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Batal"
 
-#: 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 "Ya"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Tidak"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 e7b0357a3ce220b959f675fe7ae37b66b16df827..17c0d30f7a7a96eff9ec1b0193447ccd66504d6f 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Ralat"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Saiz"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/ms_MY/files_encryption.po b/l10n/ms_MY/files_encryption.po
index bbbe2f3aa5a83ec784e087ba855e6af074e7501c..008fc5ac97ea28958422c406ea63a666b3c5db17 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 36a6392e39a57316de49032c921c3e501d1945cc..adf2524588b95fde14ff574d855a9a646481592e 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 efab3f4042f4594bdd6803ba28cdcb4d3775a184..235ff8931690a6d451fc0239f90e0ca6ae734c22 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 f70d21e7140af2d0404bd8fd4b322fc29dbfa3ec..5fdf6338aa6d0b9b1e33d68bce61fa43c2dd68ca 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 145dfa69af5b81c7e35dc71ad616139b95aa1ccd..2eb4f60fc04e9068338c537d2b226a061c831662 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 484e24be5935ff83d40ed17b908c18110570f202..a6041e01c602cd08ad0146c5ab681b82d6f69976 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "Nama pengguna"
+
+#: 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 1df50e9ef62ea59024f6f7c0321088b75380789f..3d198f9dd9f6b51453e35f187e4a708f738189f7 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 acf08a184c102ca56b208050322485b83418e8c1..57b4d246ca079e9e24fba65b31bec0c2e2c7093c 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 ea59f428ab422cc5842b0c49d467c9c721a0eb9b..516852def2f34281fd852708d2264e7e3f60c959 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 d9769ad9231f174954e683e285feadf9f5072971..950211e9b2df538068835ce90f214868ae181851 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr ""
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/my_MM/files_encryption.po b/l10n/my_MM/files_encryption.po
index 876bedaf9148dc863b058196602aa99d90a8a015..95bb02b424d1b7e50a9c9a1146bf5530a296b12c 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 0b655da998fc9aa895b577ce3f1704363f00aa82..a2fd69ceacf4a9f280bfc4f52274ce46fb2d9be5 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 fed2bd8bf6100670c724129e3b02eec511ec1bd5..78a5dd6e1d4c6198e5df5b6b1e94b7d7e7083c3e 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 d80dc9bfb154e79d1cabb6874cd6323c509204bb..9259cad22c35cf74d3dd4a6495ed1bee255f22c2 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-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\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:105
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:108
+#: 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:68
+#: templates/personal.php:74
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:96
+#: 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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "သုံးစွဲသူအမည်"
+
+#: 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_ldap.po b/l10n/my_MM/user_ldap.po
index f5d26e3942c2384645cb5c9272fb4edbf4df04a5..be14d277016e7823fcfd7a19bd13aa36b8a552fb 100644
--- a/l10n/my_MM/user_ldap.po
+++ b/l10n/my_MM/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-06-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/my_MM/user_webdavauth.po b/l10n/my_MM/user_webdavauth.po
index 51443b323f3065604691278a99a65b59ec8ac709..f89dd9cd9e7ddd827d9ffa32128cd65ed50630c9 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 777542c0001290305d3dec181bc51e88a8110571..b44d52211e65132e1e76b80ad182293ccf2d24db 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
@@ -216,23 +197,23 @@ msgstr "Ã¥r siden"
 msgid "Choose"
 msgstr "Velg"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: 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 "Ja"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Nei"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 d3b6ec09dde7f2b4711d727bbd26b8b6b140b872..36898ad1be361887276ae78cd75c53e629aaf7f0 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -184,35 +184,35 @@ msgstr "URL-en kan ikke være tom."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ugyldig mappenavn. Bruk av \"Shared\" er reservert av ownCloud."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Feil"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Endret"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} filer"
 
diff --git a/l10n/nb_NO/files_encryption.po b/l10n/nb_NO/files_encryption.po
index 0ff991d14d1128f0763d9bacbc3963d528fa5726..90df7bac2fdf05edba6e534f583ca53d0bbf5b10 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 cdb5af275e92f76bd16555f2cc5e55b22c3f76a7..61769ee279ea5def33c14972f0ff233081bcb9fc 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 bc0f67466113df8cc4fc01bc191bf8490a2e6d8c..fe4c94e896f80fb9ac28b8e283a89539923587e4 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 605f48efbcb50ae2570b6e16de4899a0abddfcb7..51f52b419bc9db9f3f9d4fe435fb22b874553244 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 971d77f72c3ec89ed717e1b8d620deecad20f002..0b6240bd983184e913e4d8b0e17ef98d6b7366a1 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 e19e1a0fcbd270f3df570617917545c94b44514f..b1d3711727ea7d0c6b25669800413af6bc1eb524 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr "Logginn navn"
 
@@ -464,34 +464,44 @@ 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:84
+msgid "Username"
+msgstr "Brukernavn"
+
+#: 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 7e92e2ca5b0dce0045a5fd901aae871013713843..07f39f2fbe43987b1413179d0c4b314af47f5022 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 6228186b672966b6423f3287368469a2d72ca27c..189cee27197cd9d16d40d48d476494a8229d7e05 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 bbe6f7e5afc91cb8cf4985be4c2cfb033ccd9fee..f9febd9c8da265f42bf79bfa7ad361eaf12c3967 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-20 02:37+0200\n"
+"PO-Revision-Date: 2013-06-20 00:37+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: 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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 f9b5d81ccffa9f6f6a47cbb8eac8ee219efc76eb..2396ee1c09e0cef937be04a9691961ab339fe773 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 978e72b2ebf14de308dbe0fe1ad82c0f326ed38f..fa5c18ee25c9c47f8a72a686788d7c935fe510b8 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 e1e8ae4a62f49c9d14a157fbdcbf030aa0d7e396..ae9c39a29d8b45edfd2c3996f25888a100bb72d9 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-20 02:37+0200\n"
+"PO-Revision-Date: 2013-06-20 00:37+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\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:105
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:108
+#: 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:68
+#: templates/personal.php:74
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:96
+#: 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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr ""
+
+#: 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 d8b30a63e3597b0dfd67a099f6918dd1055be87e..c71f7955bdf861d85ed733e622c44f2b711bde4e 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 7e9124bb1f8a253c06ef8b18fb439be87f38a299..acf73fb8fdb51f3784764b6db3d60dad9607fa9f 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # André Koot <meneer@tken.net>, 2013
+# Jorcee <mail@jordyc.nl>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+0000\n"
+"Last-Translator: Jorcee <mail@jordyc.nl>\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"
@@ -20,27 +21,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 jou"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -48,7 +30,7 @@ msgstr "Categorie type niet opgegeven."
 
 #: ajax/vcategories/add.php:30
 msgid "No category to add?"
-msgstr "Geen categorie toevoegen?"
+msgstr "Geen categorie om toe te voegen?"
 
 #: ajax/vcategories/add.php:37
 #, php-format
@@ -83,31 +65,31 @@ msgstr "Verwijderen %s van favorieten is mislukt."
 
 #: js/config.php:34
 msgid "Sunday"
-msgstr "Zondag"
+msgstr "zondag"
 
 #: js/config.php:35
 msgid "Monday"
-msgstr "Maandag"
+msgstr "maandag"
 
 #: js/config.php:36
 msgid "Tuesday"
-msgstr "Dinsdag"
+msgstr "dinsdag"
 
 #: js/config.php:37
 msgid "Wednesday"
-msgstr "Woensdag"
+msgstr "woensdag"
 
 #: js/config.php:38
 msgid "Thursday"
-msgstr "Donderdag"
+msgstr "donderdag"
 
 #: js/config.php:39
 msgid "Friday"
-msgstr "Vrijdag"
+msgstr "vrijdag"
 
 #: js/config.php:40
 msgid "Saturday"
-msgstr "Zaterdag"
+msgstr "zaterdag"
 
 #: js/config.php:45
 msgid "January"
@@ -217,23 +199,23 @@ msgstr "jaar geleden"
 msgid "Choose"
 msgstr "Kies"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Annuleer"
 
-#: 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 "Fout bij laden van bestandsselectie sjabloon"
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Nee"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -296,7 +278,7 @@ msgstr "Deel met link"
 
 #: js/share.js:167
 msgid "Password protect"
-msgstr "Wachtwoord beveiliging"
+msgstr "Wachtwoord beveiligd"
 
 #: js/share.js:169 templates/installation.php:54 templates/login.php:26
 msgid "Password"
@@ -320,7 +302,7 @@ msgstr "Vervaldatum"
 
 #: js/share.js:211
 msgid "Share via email:"
-msgstr "Deel via email:"
+msgstr "Deel via e-mail:"
 
 #: js/share.js:213
 msgid "No people found"
@@ -391,11 +373,11 @@ msgstr "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https
 
 #: js/update.js:18
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud."
+msgstr "De update is geslaagd. Je wordt teruggeleid naar je eigen ownCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
-msgstr "ownCloud wachtwoord herstellen"
+msgstr "ownCloud-wachtwoord herstellen"
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
@@ -406,22 +388,34 @@ 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 "De link voor het resetten van uw wachtwoord is verzonden naar uw e-mailadres.<br>Als u dat bericht niet snel ontvangen hebt, controleer dan uw spambakje.<br>Als het daar ook niet is, vraag dan uw beheerder om te helpen."
+msgstr "De link voor het resetten van je wachtwoord is verzonden naar je e-mailadres.<br>Als je dat bericht niet snel ontvangen hebt, controleer dan uw spambakje.<br>Als het daar ook niet is, vraag dan je beheerder om te helpen."
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "Aanvraag mislukt!<br>Weet u zeker dat uw gebruikersnaam en/of wachtwoord goed waren?"
+msgstr "Aanvraag mislukt!<br>Weet je zeker dat je gebruikersnaam en/of wachtwoord goed waren?"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
-msgstr "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail."
+msgstr "Je ontvangt een link om je wachtwoord opnieuw in te stellen via e-mail."
 
 #: lostpassword/templates/lostpassword.php:18 templates/installation.php:48
 #: templates/login.php:19
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:22
+msgid ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Je bestanden zijn versleuteld. Als je geen recoverykey hebt ingeschakeld is er geen manier om je data terug te krijgen indien je je wachtwoord reset!\nAls je niet weet wat te doen, neem dan alsjeblieft contact op met je administrator eer je doorgaat.\nWil je echt doorgaan?"
+
+#: 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:27
 msgid "Request reset"
 msgstr "Resetaanvraag"
 
@@ -435,7 +429,7 @@ msgstr "Naar de login-pagina"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr "Nieuw"
+msgstr "Nieuw wachtwoord"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
@@ -469,6 +463,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 jou.\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"
@@ -484,36 +493,36 @@ msgstr "Beveiligingswaarschuwing"
 
 #: templates/installation.php:25
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr "Uw PHP versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)"
+msgstr "Je PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)"
 
 #: templates/installation.php:26
 msgid "Please update your PHP installation to use ownCloud securely."
-msgstr "Werk uw PHP installatie bij om ownCloud veilig te kunnen gebruiken."
+msgstr "Werk je PHP-installatie bij om ownCloud veilig te kunnen gebruiken."
 
 #: templates/installation.php:32
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr "Er kon geen willekeurig nummer worden gegenereerd. Zet de PHP OpenSSL extentie aan."
+msgstr "Er kon geen willekeurig nummer worden gegenereerd. Zet de PHP OpenSSL-extentie aan."
 
 #: 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 "Zonder random nummer generator is het mogelijk voor een aanvaller om de reset tokens van wachtwoorden te voorspellen. Dit kan leiden tot het inbreken op uw account."
+msgstr "Zonder random nummer generator is het mogelijk voor een aanvaller om de resettokens van wachtwoorden te voorspellen. Dit kan leiden tot het inbreken op uw account."
 
 #: templates/installation.php:39
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess bestand niet werkt."
+msgstr "Je gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet werkt."
 
 #: 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 "Informatie over het configureren van uw server is hier te vinden <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">documentatie</a>."
+msgstr "Informatie over het configureren van uw server is <a href=\"http://doc.owncloud.org/server/5.0/admin_manual/installation.html\" target=\"_blank\">hier</a> te vinden."
 
 #: templates/installation.php:44
 msgid "Create an <strong>admin account</strong>"
@@ -555,22 +564,18 @@ msgstr "Database tablespace"
 
 #: templates/installation.php:166
 msgid "Database host"
-msgstr "Database server"
+msgstr "Databaseserver"
 
 #: templates/installation.php:172
 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"
 
@@ -582,15 +587,15 @@ msgstr "Automatische aanmelding geweigerd!"
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr "Als u uw wachtwoord niet onlangs heeft aangepast, kan uw account overgenomen zijn!"
+msgstr "Als je je wachtwoord niet onlangs heeft aangepast, kan je account overgenomen zijn!"
 
 #: templates/login.php:12
 msgid "Please change your password to secure your account again."
-msgstr "Wijzig uw wachtwoord zodat uw account weer beveiligd is."
+msgstr "Wijzig je wachtwoord zodat je account weer beveiligd is."
 
 #: templates/login.php:34
 msgid "Lost your password?"
-msgstr "Uw wachtwoord vergeten?"
+msgstr "Wachtwoord vergeten?"
 
 #: templates/login.php:39
 msgid "remember"
@@ -604,6 +609,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 jou.<br><a href=\"%s\">Bekijk!</a><br><br>Veel plezier!"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "vorige"
@@ -615,4 +627,4 @@ msgstr "volgende"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "Updaten ownCloud naar versie %s, dit kan even duren."
+msgstr "Updaten ownCloud naar versie %s, dit kan even duren..."
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index c7952ad45828dac17812fdb25972065938c66f0b..63ab584db3c0f20894b2ce181c7ef329c999da26 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -184,35 +184,35 @@ msgstr "URL kan niet leeg zijn."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Fout"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Naam"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Grootte"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Aangepast"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 map"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} mappen"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 bestand"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} bestanden"
 
diff --git a/l10n/nl/files_encryption.po b/l10n/nl/files_encryption.po
index 92b7cddfd69909a108cfb8153ac6f570bfcc8e7a..32e9b8276610762a2348e89c77a2d8e7759fcd82 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-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 20:00+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,128 @@ 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 "Privésleutel succesvol bijgewerkt."
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr "Kon het wachtwoord van de privésleutel niet wijzigen. Misschien was het oude wachtwoord onjuist."
+
+#: 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 "Uw privésleutel is niet geldig! Misschien was uw wachtwoord van buitenaf gewijzigd. U kunt het wachtwoord van uw privésleutel bijwerking in uw persoonlijke instellingen om bij uw bestanden te komen."
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr "PHP module OpenSSL is niet geïnstalleerd."
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr "Vraag uw beheerder deze module te installeren. Tot zolang is de crypto app gedeactiveerd."
+
 #: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr "Activeren herstelsleutel (maakt het mogelijk om gebruikersbestanden terug te halen in geval van verlies van het wachtwoord):"
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
-msgstr "Herstel account wachtwoord"
+#: templates/settings-admin.php:14
+msgid "Recovery key password"
+msgstr "Wachtwoord herstelsleulel"
 
-#: 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
-msgid "Change encryption passwords recovery key:"
-msgstr "Wijzig versleuteling wachtwoord herstelsleutel"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr "Wijzig wachtwoord herstelsleutel:"
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
-msgstr "Oude herstel account wachtwoord"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
+msgstr "Oude wachtwoord herstelsleutel"
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
-msgstr "Nieuwe herstel account wachtwoord"
+#: templates/settings-admin.php:48
+msgid "New Recovery key password"
+msgstr "Nieuwe wachtwoord herstelsleutel"
 
-#: 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 "Het wachtwoord van uw privésleutel komt niet meer overeen met uw inlogwachtwoord:"
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr "Stel het wachtwoord van uw oude privésleutel in op uw huidige inlogwachtwoord."
+
+#: 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 48cf0b02cc59634bce2795724a37b05a2b115c18..22b31b7cb68bcb65581f6cc9197249d0886f04e1 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 75f66ba8f5f5e214dd38890ad771b0e748bfba27..3030a7ff093fe3af838c67df4db07650e205dc20 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 70d7161817a218c6217c5cea1c0f2e2aa0fe7908..5ca2b42dbdc1c2643efd75874b65dfa7746176c9 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 681b5532fd98de9a33e63dd476b294918a05dd7b..63a62f4fc18606f3cf820e905884c31e2b85c129 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 47b47d57df3969fb3e2ae8b89c13eb898256a0bb..1d99995b01c650f1774324732e499eebb3c998d4 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # André Koot <meneer@tken.net>, 2013
+# helonaut, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,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"
 
@@ -137,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"
 
@@ -325,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 "
@@ -339,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"
 
@@ -387,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 "U heeft <strong>%s</strong> van de <strong>%s</strong>  beschikbaren gebruikt"
-
-#: templates/personal.php:15
+#: templates/personal.php:9
 msgid "Get the apps to sync your files"
-msgstr "Download de apps om bestanden te synchen"
+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 e-mailadres in om wachtwoord reset uit te kunnen voeren"
+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
 msgid "Login Name"
 msgstr "Inlognaam"
 
@@ -464,34 +465,44 @@ 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 "Default opslag"
+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:84
+msgid "Username"
+msgstr "Gebruikersnaam"
+
+#: templates/users.php:91
 msgid "Storage"
-msgstr "Opslag"
+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 "Default"
+msgstr "Standaard"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index abd7ffccfebab34e7b806f23bcbdd9472b5f6983..ab687b7d61d090c9a73b3821f9a18e5d17d1b340 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 9cd0fb7d2e0e6f82db8a2fab4eb350124131d61c..16a063e349f5e38a2389d21c3d3ceaec4a29d0d5 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 02bc28361685c3f88095f0ef7d38f73a773ed0a5..6f2f75d30a3ae32b3ae80925616ec1b071502b6a 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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."
@@ -218,23 +199,23 @@ msgstr "Ã¥r sidan"
 msgid "Choose"
 msgstr "Vel"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: 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 "Ja"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Nei"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Greitt"
 
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 3e649ef10d8511cf625609d5f344ca19934274bf..d01efdeb8320d297b102583672db77ec470ad757 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -185,35 +185,35 @@ msgstr "Nettadressa kan ikkje vera tom."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Feil"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Storleik"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Endra"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} filer"
 
diff --git a/l10n/nn_NO/files_encryption.po b/l10n/nn_NO/files_encryption.po
index 03d96695bf52138f8d26f51d8c217cb3a8e9b706..0865d1e3a4b83166d58aec187327b4adf799da02 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 ff8d073d4d69cb863636f9d648612dd276896177..cda028d5e38bf39e5534ec8a8342d54e2d18b1c7 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 be0de366a60a80a3cbd04632e21c1b1e124de07b..372ed6d6c18929060f7a8ca4a7f8be2673a8ed68 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
-"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 96fe31c4038904e5aae5ed42f02e148ed4df05d1..6d56f2fd622d17b59573db2b77832255c552e89b 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 e28aaf68512f3f350ac2ede11f421fffdca70d35..7c40ad0267fc47334ba92227c2655ef97ac5f3d7 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 8fd884206149c6b12568ffa0d659f88be19ba4a3..916a72b757fba0a6b732c3b1983cdafdd3630cc0 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
 msgid "Login Name"
 msgstr "Innloggingsnamn"
 
@@ -465,34 +465,44 @@ 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:84
+msgid "Username"
+msgstr "Brukarnamn"
+
+#: 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 1be6b4e2852697046ec4bd1b854db9ad274edda3..ebfd177d97bf3572ca0e770c6396753cca99af35 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 37bb2ea522ad719f5a8209963123e1ee6d42dece..b281d34b07ebe9b3e684f83477f9e43a6ea6be64 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 0281a3811367ee9d0bc331a18a0d519635228517..4b2117cfc89db4734374590cbf12d35a24f64377 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
@@ -216,23 +197,23 @@ msgstr "ans a"
 msgid "Choose"
 msgstr "Causís"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Annula"
 
-#: 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 "Ã’c"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Non"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "D'accòrdi"
 
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 e01f381dc5ffccf817aa34d29b220c85afa9e27c..8af162e48abcc0bdfa37b832742eeba1b0c96ca3 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Error"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Talha"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/oc/files_encryption.po b/l10n/oc/files_encryption.po
index 0277916620b5c4aeaf334a34d45e5f8d1c472aa8..e8b60caa5c562b80f515c9768d2cb612352839b6 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 fddd4f32dda88eb9847852bd856b319cf1e64362..60201730b473364d36c40c4c57f29acc6113276e 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 01588c6a8757347fc439fc8475eec62f11086970..f1a7e52a4a47fbd297763b99c14534d09f5a6a9d 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 2794272c013c47ffbb428bc32fd5209849b56008..2fb04aa5672bc87168107f15fec58b722e49e6c4 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 bcefe3b1d74042c2f16158b80d16b587da4fbe9a..a5c02474d03225d8727129ea6632056d53a7a61c 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-02 02:01+0200\n"
-"PO-Revision-Date: 2013-06-02 00:02+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 027b3d41795376674d66dc2ca87cfd5b896dbc39..78869cc489a1a1d45bd42c212af6346df770fe93 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "Non d'usancièr"
+
+#: 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 42404d1acfb6b9dc47b7af6d74a8af3e2d8466a2..0885215d87f710ffab5a95423b405c314c5ec676 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 13f4be6160241ece29d5e6e9d958ce22ad6753c1..72a127406ac1085d2a700f0a91f101987babebe1 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 accc96f80cecab82a844c07355e9d10b2a957554..0fd55c5093989eef959e03a3a1c4933364cbe5ed 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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 "%s Współdzielone »%s« z tobą"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -218,23 +199,23 @@ msgstr "lat temu"
 msgid "Choose"
 msgstr "Wybierz"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: 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 "BÅ‚Ä…d podczas Å‚adowania pliku wybranego szablonu"
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Tak"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Nie"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "OK"
 
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "Tak, naprawdę chcę zresetować hasło teraz"
+
+#: lostpassword/templates/lostpassword.php:27
 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 ad1467f6580eeacb9b5a4aee98673a305ab96900..b5f3a722169a2a6e3394b2f0b2ab54b3b34c20ed 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -184,35 +184,35 @@ msgstr "URL nie może być pusty."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nieprawidłowa nazwa folderu. Korzystanie z nazwy „Shared” jest zarezerwowane dla ownCloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Nazwa"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Rozmiar"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Modyfikacja"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "Ilość folderów: {count}"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 plik"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "Ilość plików: {count}"
 
diff --git a/l10n/pl/files_encryption.po b/l10n/pl/files_encryption.po
index 5c3311df32ba7e3c5cc7f92b0a306ae1de99e9fb..ea5f5a39204c2ffb96323ff82f03a8748053b3f3 100644
--- a/l10n/pl/files_encryption.po
+++ b/l10n/pl/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-05-30 02:27+0200\n"
-"PO-Revision-Date: 2013-05-30 00:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-25 02:04+0200\n"
+"PO-Revision-Date: 2013-06-24 12:10+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,21 +20,21 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Klucz odzyskiwania włączony"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Nie można włączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!"
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Klucz odzyskiwania wyłączony"
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Nie można wyłączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!"
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
@@ -44,61 +44,128 @@ 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 "Pomyślnie zaktualizowano hasło klucza prywatnego."
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr "Nie można zmienić prywatnego hasła. Może stare hasło nie było poprawne."
+
+#: 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 "Klucz prywatny nie jest poprawny! Może Twoje hasło zostało zmienione z zewnątrz. Można zaktualizować hasło klucza prywatnego w ustawieniach osobistych w celu odzyskania dostępu do plików"
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr "Moduł PHP OpenSSL nie jest zainstalowany"
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr "Proszę poproś administratora serwera aby zainstalował ten moduł. Obecnie aplikacja szyfrowanie została wyłączona."
+
 #: 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 "Klucz prywatny nie jest poprawny! Może Twoje hasło zostało zmienione z zewnątrz."
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr "Możesz odblokować swój klucz prywatny w swojej"
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr "Ustawienia osobiste"
+
 #: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
-msgstr "Odzyskiwanie hasła konta"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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 "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
-msgid "Change encryption passwords recovery key:"
-msgstr "Zmiana klucza szyfrowania haseł odzyskiwania:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
-msgstr "Stare hasło odzyskiwania"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
+msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
-msgstr "Nowe hasło odzyskiwania"
+#: templates/settings-admin.php:48
+msgid "New Recovery key password"
+msgstr ""
 
-#: 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 "Hasło klucza prywatnego nie pasuje do  hasła logowania:"
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr "Podaj swoje stare prywatne hasło aby ustawić nowe"
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr "Jeśli nie pamiętasz swojego starego hasła, poproś swojego administratora, aby odzyskać pliki."
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr "Stare hasło logowania"
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr "Bieżące hasło logowania"
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr "Aktualizacja hasła klucza prywatnego"
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr "Włącz hasło odzyskiwania:"
+
+#: 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 "Włączenie tej opcji umożliwia otrzymać dostęp do zaszyfrowanych plików w przypadku utraty hasła"
 
-#: 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 11491689a2ebaeb00446a506a112dc69c3b34daa..b990d3c0a44440473ab9068644f3928a5d0cbc6f 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 a72cd5421d03a768f1a00157ee951e696ef416c5..dfcc243b6a1b379704e1b57ce04272c25ba196aa 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 32ea27e1c974a66abfa833bd2c2ba34dc99015b0..08717d2bdfff38961a3fa2655017b9d7b9cce2ae 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 bcb4e58f74095173b307fa2f56321c67c6ea6d0f..cc92491605f6c0a45670a4635a7ad5fa12569dd1 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 0f7d1b635730d462011f4ecaaffb26b749d67a89..082c0cc5bf21eab6a2a6e03f6ade5acc9f7a4355 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
 msgid "Login Name"
 msgstr "Login"
 
@@ -465,34 +465,44 @@ 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 "Wpisz hasło odzyskiwania, aby odzyskać pliki użytkowników podczas zmiany hasła"
+
+#: 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:84
+msgid "Username"
+msgstr "Nazwa użytkownika"
+
+#: 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 7b17734c312fff3f2b490313e01f844bbf9f490d..0ff7668ea88bf8feccc67d95152cac0cf64b7e5a 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
+# orcio6 <orcio6@o2.pl>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -359,7 +360,7 @@ msgid ""
 "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 ""
+msgstr "Domyślnie, wewnętrzna nazwa użytkownika zostanie utworzona z atrybutu UUID, ang. Universally unique identifier - Unikalny identyfikator użytkownika. To daje pewność, że nazwa użytkownika jest niepowtarzalna a znaki nie muszą być konwertowane. Wewnętrzna nazwa użytkownika dopuszcza jedynie znaki: [ a-zA-Z0-9_.@- ]. Pozostałe znaki zamieniane są na ich odpowiedniki ASCII lub po prostu pomijane. W przypadku, gdy nazwa się powtarza na końcu dodawana / zwiększana jest cyfra. Wewnętrzna nazwa użytkownika służy do wewnętrznej identyfikacji użytkownika. Jest to również domyślna nazwa głównego folderu w ownCloud. Jest to również klucz zdalnego URL, na przykład dla wszystkich usług *DAV. Dzięki temu ustawieniu można modyfikować domyślne zachowania. Aby osiągnąć podobny efekt jak w ownCloud 5 wpisz atrybut nazwy użytkownika w poniższym polu. Pozostaw puste dla domyślnego zachowania. Zmiany będą miały wpływ tylko na nowo stworzonych (dodane) użytkowników LDAP."
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
diff --git a/l10n/pl/user_webdavauth.po b/l10n/pl/user_webdavauth.po
index 0f5ded49b5074e9efa2e80bceaed5869e748b6e9..2df6fe576de2f9469a2e781b072dfc472f8a0adf 100644
--- a/l10n/pl/user_webdavauth.po
+++ b/l10n/pl/user_webdavauth.po
@@ -4,15 +4,15 @@
 # 
 # Translators:
 # bbartlomiej <bbartlomiej@gmail.com>, 2013
-# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012-2013
 # Marcin Małecki <gerber@tkdami.net>, 2012
 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-18 02:04+0200\n"
+"PO-Revision-Date: 2013-06-17 09:50+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,8 +25,8 @@ msgid "WebDAV Authentication"
 msgstr "Uwierzytelnienie WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr "URL: "
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/pl_PL/core.po b/l10n/pl_PL/core.po
index 76a2a7cbbf7fe135f62b010bfa7f4133dded603b..7b4ef7d09a142828b32b646fcef8e5a073b04755 100644
--- a/l10n/pl_PL/core.po
+++ b/l10n/pl_PL/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-02 02:01+0200\n"
-"PO-Revision-Date: 2013-06-02 00:02+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -216,23 +216,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 ""
 
diff --git a/l10n/pl_PL/lib.po b/l10n/pl_PL/lib.po
index 008b5aca83e804cf57a67729d3165c09dd05bc30..e91de0bce1e6f4f72dc0e74331a2e94ba6c8d7ae 100644
--- a/l10n/pl_PL/lib.po
+++ b/l10n/pl_PL/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-02 02:01+0200\n"
-"PO-Revision-Date: 2013-06-02 00:02+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index baa7132956c8ae7636159a7a1966d3c2e1675181..94b3ebe752c822a9c631130abd1a7cbc5826d5af 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -20,27 +21,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 "%s compartilhou »%s« com você"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -217,23 +199,23 @@ msgstr "anos atrás"
 msgid "Choose"
 msgstr "Escolha"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: 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 "Template selecionador Erro ao carregar arquivo"
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Sim"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Não"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -393,7 +375,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:60
 msgid "ownCloud password reset"
 msgstr "Redefinir senha ownCloud"
 
@@ -421,7 +403,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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Seus arquivos estão encriptados. Se você não habilitou a chave de recuperação, não haverá maneira de recuperar seus dados após criar uma nova senha. Se você não tem certeza do que fazer,  por favor entre em contato com o administrador antes de continuar. Tem certeza que realmente quer continuar?"
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "Sim, realmente quero criar uma nova senha."
+
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Pedir redefinição"
 
@@ -469,6 +463,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 "Olá,\n\napenas para você saber que %s compartilhou %s com você.\nVeja: %s\n\nAbraços!"
+
+#: 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 +570,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 +609,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 "Olá,<br><br>apenas para você saber que %s compartilhou %s com você.<br><a href=\"%s\">Veja: </a><br><br>Abraços!"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "anterior"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 7a4deb445f2f2f91128fc04289d42d9207f0621b..0ac745ad1d13cb45122df9d1730e0a7be869277f 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -184,35 +184,35 @@ msgstr "URL não pode ficar em branco"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nome de pasta inválido. O uso de 'Shared' é reservado para o Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Erro"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} pastas"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 arquivo"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} arquivos"
 
diff --git a/l10n/pt_BR/files_encryption.po b/l10n/pt_BR/files_encryption.po
index 406cccd3c9dced72c4d957e7e606d97d0ec723ca..8dcc59e4ab9b9048b5d4a11a6e0aa49e22305a7c 100644
--- a/l10n/pt_BR/files_encryption.po
+++ b/l10n/pt_BR/files_encryption.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-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-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 16:30+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"
@@ -44,61 +45,128 @@ 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 "Senha de chave privada atualizada com sucesso."
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr "Não foi possível atualizar a senha de chave privada. Talvez a senha antiga esteja incorreta."
+
+#: 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 "Sua chave privada não é válida! Talvez sua senha tenha sido mudada. Você pode atualizar sua senha de chave privada nas suas configurações pessoais para obter novamente acesso aos seus arquivos."
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr "O módulo PHP OpenSSL não está instalado."
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr "Por favor peça ao administrador do servidor para instalar o módulo. Por enquanto o app de encriptação foi desabilitada."
+
 #: 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 "Sua chave privada não é válida! Talvez sua senha tenha sido mudada."
+
+#: templates/invalid_private_key.php:7
+msgid "You can unlock your private key in your "
+msgstr "Você pode desbloquear sua chave privada nas suas"
+
+#: templates/invalid_private_key.php:7
+msgid "personal settings"
+msgstr "configurações pessoais."
+
 #: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr "Habilitar chave de recuperação (permite recuperar arquivos de usuários em caso de perda de senha):"
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
-msgstr "Recuperar a senha da conta"
+#: templates/settings-admin.php:14
+msgid "Recovery key password"
+msgstr "Senha da chave de recuperação"
 
-#: 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
-msgid "Change encryption passwords recovery key:"
-msgstr "Mudar a criptografia de chave de recuperação de senhas:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr "Mudar a senha da chave de recuperação:"
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
-msgstr "Recuperação de senha de conta antiga"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
+msgstr "Senha antiga da chave de recuperação"
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
-msgstr "Senha Nova  da conta de Recuperação"
+#: templates/settings-admin.php:48
+msgid "New Recovery key password"
+msgstr "Nova senha da chave 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 "Sua senha de chave privada não coincide mais com sua senha de login:"
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr "Configure sua antiga senha de chave privada para sua atual senha de 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 você não se lembra de sua antiga senha você pode pedir ao administrador que recupere seus arquivos."
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr "Senha antiga de login"
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr "Atual senha de login"
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr "Atualizar senha de chave privada"
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr "Habilitar recuperação de senha:"
+
+#: 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 "Habilitar essa opção vai permitir que você obtenha novamente acesso aos seus arquivos encriptados em caso de perda de senha"
 
-#: 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 5ec6ee8a8a54fb7179331394b48b7b1a3519e58e..cd1675f0031f5613c8cae812dbb32f705c4a7c5f 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 6fa030aecfdc3ffe43a8d5566adf4d97e585f12b..2efb9557a97c88207c2fc11bcdf3c61bb1d98b28 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 a879b7924b423ee748c88c444ae90d860f4eee77..2edfad3f0dcce6a56534bf456682a4b612c08029 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 2946438dba55e48793df92d24b55452c8def7d22..b4a3db18b80a0858382acabb1e94aa07b1be4efa 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 721a969b1c0ff248db34f2f2991f10d5f1c00e29..414a167813a54e80c29171ff9f19214901efe0f0 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -3,13 +3,14 @@
 # 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -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
 msgid "Login Name"
 msgstr "Nome de Login"
 
@@ -464,34 +465,44 @@ 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:84
+msgid "Username"
+msgstr "Nome de Usuário"
+
+#: 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 ae1906c7ede102097db88b9ef5168044888b7fd9..89992c98c9905c5d29f9fa8d1435c0f7ce5f173a 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 ef503e227b11e50c88c353e6d9449f96f072da8f..c62680557cd8b348da5f9ef6b88faa1297790fae 100644
--- a/l10n/pt_BR/user_webdavauth.po
+++ b/l10n/pt_BR/user_webdavauth.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# bjamalaro <bjamalaro@yahoo.com.br>, 2013
 # Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013
 # thoriumbr <thoriumbr@gmail.com>, 2012
 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-21 08:49+0200\n"
+"PO-Revision-Date: 2013-06-20 21:50+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"
@@ -24,8 +25,8 @@ msgid "WebDAV Authentication"
 msgstr "Autenticação WebDAV"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr "URL:"
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index cb533c18d2c8526a9f3f2ad148bcd7640b1ffcab..b8860022ff1f8c9bbc5abd99aab5c6e74857a303 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: bmgmatias <bmgmatias@gmail.com>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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."
@@ -218,23 +199,23 @@ msgstr "anos atrás"
 msgid "Choose"
 msgstr "Escolha"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: 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 "Erro ao carregar arquivo do separador modelo"
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Sim"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Não"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 c0f7e43c7ebd622c7c429f91c3eb3ceae4fbcf4f..4fa324ebddb2ddd6f125d0d689d2f4e164984805 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -184,35 +184,35 @@ msgstr "O URL não pode estar vazio."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nome de pasta inválido. O Uso de 'shared' é reservado para o ownCloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Erro"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} pastas"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} ficheiros"
 
diff --git a/l10n/pt_PT/files_encryption.po b/l10n/pt_PT/files_encryption.po
index 0cba5c44e3850714fc6b20045b6d2a32c47ec97a..06b6799a08fb770884797f73fe631a7085a2e563 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: 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,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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 "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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key password"
 msgstr ""
 
-#: 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 92224eb30cbd31d70c0b807f19968fd6e7e0d5f8..44332f4b485cacf4171687bee995991e5630f64f 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 71503f3f05963467ea9ffafc2c41959d364883d6..17f46670277e678f4689399a7c8c5f6d464afcc2 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 bbc31c3a3fe5c2e3b3bb6b1958b6801d59bedb08..596e24663d729ddcb76d05bf114588f66f5d4320 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 f1c8b731d78df2616e04d676a9f7a64bfd9680fa..d6de5ad4d9914d251d63f7905d3eb2d1d8d87ace 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 14686edfb0d0fd1d46a2ddc17650c4702ea1f0ca..58ef49215bc784a54a4b507a0e4bf8a0bdd5d3ed 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: bmgmatias <bmgmatias@gmail.com>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -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
 msgid "Login Name"
 msgstr "Nome de utilizador"
 
@@ -465,34 +466,44 @@ 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:84
+msgid "Username"
+msgstr "Nome de utilizador"
+
+#: 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 dbe72a43945e08bb1fe7ebce07529c384ab480de..9044a8477d5d93f1d1ee03759486ac4ec1462e16 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 e7e520a00afa40188b17c111471149e5300a9185..bee54e46dab1e05d77669bea1856f26415b5fbe2 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 b73ffd596227d9ed0aef602f3797959b73287b83..cf70fffebd17e006358fb78b7fff8a5ab3e7ff71 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# dimaursu16 <dima@ceata.org>, 2013
 # ripkid666 <ripkid666@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+0000\n"
+"Last-Translator: dimaursu16 <dima@ceata.org>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,31 +21,12 @@ 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 "%s Partajat »%s« cu tine de"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
-msgstr "Tipul de categorie nu este prevazut"
+msgstr "Tipul de categorie nu a fost specificat."
 
 #: ajax/vcategories/add.php:30
 msgid "No category to add?"
@@ -217,23 +199,23 @@ msgstr "ani în urmă"
 msgid "Choose"
 msgstr "Alege"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Anulare"
 
-#: 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 ""
+msgstr "Eroare la încărcarea șablonului selectorului de fișiere"
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Da"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Nu"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -393,7 +375,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:60
 msgid "ownCloud password reset"
 msgstr "Resetarea parolei ownCloud "
 
@@ -421,7 +403,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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr "Fișierele tale sunt criptate. Dacă nu ai activat o cheie de recuperare, nu va mai exista nici o metodă prin care să îți recuperezi datele după resetarea parole. Dacă nu ești sigur în privința la ce ai de făcut, contactează un administrator înainte să continuii. Chiar vrei să continui?"
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "Da, eu chiar doresc să îmi resetez parola acum"
+
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Cerere trimisă"
 
@@ -469,6 +463,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 "Salutare,\n\nVă aduc la cunoștință că %s a partajat %s cu tine.\nAccesează la: %s\n\nNumai bine!"
+
+#: 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 +570,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 ""
+msgstr "%s este disponibil. Vezi mai multe informații despre procesul de actualizare."
 
-#: templates/layout.user.php:62
+#: templates/layout.user.php:67
 msgid "Log out"
 msgstr "Ieșire"
 
@@ -604,6 +609,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 "Salutare, <br><br>Vă aduc la cunoștință că %s a partajat %s cu tine.<br><a href=\"%s\">Accesează-l!</a><br><br>Numai bine!"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "precedentul"
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 37d437a7e95ea388d48f662030a20fd38cf18a4e..da1208a7e0eb356fc17072769cd28fd5ed0365c1 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# dimaursu16 <dima@ceata.org>, 2013
 # ripkid666 <ripkid666@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+0000\n"
+"Last-Translator: dimaursu16 <dima@ceata.org>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -184,41 +185,41 @@ msgstr "Adresa URL nu poate fi goală."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Invalid folder name. Usage of 'Shared' is reserved by Ownclou"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Eroare"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Nume"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Dimensiune"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} foldare"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 fisier"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} fisiere"
 
 #: lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Nume de dosar invalid. Utilizarea 'Shared' e rezervată de ownCloud"
 
 #: lib/app.php:73
 msgid "Unable to rename file"
diff --git a/l10n/ro/files_encryption.po b/l10n/ro/files_encryption.po
index b3f31e838719ca40d3d936034e74732a2551957b..d78bb7d0de1ea9f6cf771e0b655865d843889a64 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 fec3d4c6acbfd51bddec35236ab2699ec6578974..ed306efb07f8b06113b72f393c74229b634d3e6b 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 da3c59ddf7ad1e5bb4ac60c7a78cae099dd38013..51f776e22f2bca4cd51bc9aad1ba6d7daa0831e6 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 524c8b2c1ce8c08dafb13271a3fa9b998aa5ae1f..634a5214ee9623903a9137d68b580b20e588e316 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 d3a5946a1bb3e8786b90a3d7db014831c0b7d9e6..de27c52e960f356696dcf0d0a7be3bb29143182a 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 3bcdb939b06ac4bed277b96b12e54edddc74c579..2e425be1a89f749dee05c0dedce02715a3e1ce55 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "Nume utilizator"
+
+#: 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 c5709c9e502404bfbbdaf884e7189b7984b88219..efa83ef2e6990f09f62a912dcaee28c6597d71a2 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 7c28a3a2af761105d850b06e4205398b71875ad9..79f4ebb8a790942de08371322b7d43f364a4ecc6 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 a36463e09d5329b8d78b27b18511d4945d34f3a7..85820493c4da1350e421e9a754ca29b9ca37d485 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# alfsoft <alfsoft@gmail.com>, 2013
 # foool <andrglad@mail.ru>, 2013
 # Vyacheslav Muranov <s@neola.ru>, 2013
 # Langaru <langaru@gmail.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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: Langaru <langaru@gmail.com>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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 +23,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."
@@ -219,23 +201,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 "Ок"
 
@@ -395,7 +377,7 @@ msgstr "При обновлении произошла ошибка. Пожал
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud..."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:60
 msgid "ownCloud password reset"
 msgstr "Сброс пароля "
 
@@ -423,7 +405,19 @@ msgstr "На ваш адрес Email выслана ссылка для сбро
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:22
+msgid ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "Да, я действительно хочу сбросить свой пароль"
+
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Запросить сброс"
 
@@ -471,6 +465,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 "Редактировать категрии"
@@ -563,16 +572,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 +611,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/ru/files.po b/l10n/ru/files.po
index 3c8d873ceb7a1f12bcbd730ffd496225c4c1ddbf..ff958e3704586fc8317958d67e16b4e03db86b24 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Friktor <antonshramko@yandex.ru>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -183,41 +184,41 @@ msgstr "Ссылка не может быть пустой."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Неправильное имя каталога. Имя 'Shared' зарезервировано."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Ошибка"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Имя"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Изменён"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} папок"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} файлов"
 
 #: lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Неправильное имя каталога. Имя 'Shared' зарезервировано."
 
 #: lib/app.php:73
 msgid "Unable to rename file"
diff --git a/l10n/ru/files_encryption.po b/l10n/ru/files_encryption.po
index 3cb93ae3108861c9965c2b04ddd2cb5c9a39eed5..44fa7c2176f0dbe1ebdedf85194f0bc49365b85d 100644
--- a/l10n/ru/files_encryption.po
+++ b/l10n/ru/files_encryption.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Ант По <du6egub@gmail.com>, 2013
+# alfsoft <alfsoft@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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +21,7 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Ключ восстановления успешно установлен"
 
 #: ajax/adminrecovery.php:34
 msgid ""
@@ -29,7 +30,7 @@ msgstr ""
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Ключ восстановления успешно отключен"
 
 #: ajax/adminrecovery.php:53
 msgid ""
@@ -44,61 +45,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Сохранение..."
 
+#: 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 "Включить шифрование пароля ключа восстановления (понадобится разрешение для восстановления ключа)"
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
-msgstr "Восстановление пароля учетной записи"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
-msgstr "Изменить шифрование пароля ключа восстановления:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
-msgstr "Старое Восстановление пароля учетной записи"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
+msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
-msgstr "Новое Восстановление пароля учетной записи"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 bd2a52616df9415894add07a41886b2de238e26d..577f1c2213ec3d3cab0c0d008f262d7014b135fd 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 26b75dfce7c6a626a8a6720c47cc12d56bb5210d..7e9d5b98c8d896bfe6d736d0b3c7000f2fcd66cb 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 783b6edd7dca982873913dacea98353655820f9a..c5626e33fcbd71a7dc5023b29e99c8a7eec5b7d5 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 83a323ff7a91e855d88c894e8e49d34cd127f245..f9e070170a25bda993942be88cace3f3e3211a26 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Friktor <antonshramko@yandex.ru>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,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"
 
@@ -113,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 ""
+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 4e774779e2411c7d86b2ecd16e8301ebb68a247c..2ea3ed59461dcb23f1e882313574b0a3c257cf8e 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# alfsoft <alfsoft@gmail.com>, 2013
 # eurekafag <eurekafag@eureka7.ru>, 2013
+# Friktor <antonshramko@yandex.ru>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -59,7 +61,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 +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 "Удалить"
 
@@ -325,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 "
@@ -339,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 "Обновить"
 
@@ -387,76 +389,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
 msgid "Login Name"
 msgstr "Имя пользователя"
 
@@ -464,34 +466,44 @@ msgstr "Имя пользователя"
 msgid "Create"
 msgstr "Создать"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
-msgstr ""
+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:84
+msgid "Username"
+msgstr "Имя пользователя"
+
+#: 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 597c639b614f072d49ae0433d00bdba0735ea855..aa89e80f4a2c32adb241e4a4ebf393143914b1be 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Fenuks <fenuksuh@ya.ru>, 2013
+# alfsoft <alfsoft@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+0000\n"
+"Last-Translator: alfsoft <alfsoft@gmail.com>\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"
@@ -19,7 +21,7 @@ msgstr ""
 
 #: ajax/clearMappings.php:34
 msgid "Failed to clear the mappings."
-msgstr ""
+msgstr "Не удалось очистить соотвествия."
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
@@ -59,7 +61,7 @@ msgstr "Не получилось добавить конфигурацию се
 
 #: js/settings.js:111
 msgid "mappings cleared"
-msgstr ""
+msgstr "Соответствия очищены"
 
 #: js/settings.js:112
 msgid "Success"
@@ -342,7 +344,7 @@ msgstr "Оставьте имя пользователя пустым (по ум
 
 #: templates/settings.php:101
 msgid "Internal Username"
-msgstr ""
+msgstr "Внутреннее имя пользователя"
 
 #: templates/settings.php:102
 msgid ""
@@ -358,15 +360,15 @@ msgid ""
 "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 ""
+msgstr "По-умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Это необходимо для того, чтобы имя пользователя было уникальным и не содержало в себе запрещенных символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы замещаются соответствиями из таблицы ASCII или же просто пропускаются. При совпадении к имени будет добавлено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по-умолчанию для папки пользователя в ownCloud. Оно также портом для удаленных ссылок, к примеру, для всех сервисов *DAV. С помощию данной настройки можно изменить поведение по-умолчанию. Чтобы достичь поведения, как было настроено до изменения, ownCloud 5 выводит атрибут имени пользователя в этом поле. Оставьте его пустым для режима по-умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP."
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
-msgstr ""
+msgstr "Аттрибут для внутреннего имени:"
 
 #: templates/settings.php:104
 msgid "Override UUID detection"
-msgstr ""
+msgstr "Переопределить нахождение UUID"
 
 #: templates/settings.php:105
 msgid ""
@@ -377,15 +379,15 @@ msgid ""
 "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 ""
+msgstr "По-умолчанию, ownCloud определяет атрибут UUID автоматически. Этот атрибут используется для того, чтобы достоверно индентифицировать пользователей и группы LDAP. Также, на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по-умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP."
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
-msgstr ""
+msgstr "Аттрибут для UUID:"
 
 #: templates/settings.php:107
 msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "Соответствия Имя-Пользователь LDAP"
 
 #: templates/settings.php:108
 msgid ""
@@ -400,15 +402,15 @@ msgid ""
 "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 ""
+msgstr "ownCloud использует имена пользователей для хранения и назначения метаданных. Для точной идентификации и распознавания пользователей, каждый пользователь LDAP будет иметь свое внутреннее имя пользователя. Это требует наличия соответствия имени пользователя ownCloud к пользователю LDAP. При создании имя пользователя назначается идентификатору UUID пользователя LDAP. Помимо этого кэшируется доменное имя (DN) для снижения взаимодействия LDAP, однако оно не используется для идентификации. Если доменное имя было изменено, об этом станет известно ownCloud. Внутреннее имя ownCloud используется повсеместно в ownCloud. При очистке соответствий повсюду будут оставаться \"хвосты\". Очистка соответствий не привязана к конкретной конфигурации, она влияет на все конфигурации LDAP! Никогда не очищайте соответствия в рабочем окружении. Очищайте соответствия только во время тестов или в экспериментальных конфигурациях."
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "Очистить соответствия Имя-Пользователь LDAP"
 
 #: templates/settings.php:109
 msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "Очистить соответствия Группа-Группа LDAP"
 
 #: templates/settings.php:111
 msgid "Test Configuration"
diff --git a/l10n/ru/user_webdavauth.po b/l10n/ru/user_webdavauth.po
index d6d190c1eacb8600b3c61e178a477b622b2e1e0e..ad92e25e80dbb8b65348b24d04504ad33e052310 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/ru_RU/core.po b/l10n/ru_RU/core.po
index 4a533168c0007b5932e0d16d2be7a366c2d44b4d..06111cdf7c6ce9db02e06b9b4e3d5e9ce200339f 100644
--- a/l10n/ru_RU/core.po
+++ b/l10n/ru_RU/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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -216,23 +216,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 ""
 
diff --git a/l10n/ru_RU/lib.po b/l10n/ru_RU/lib.po
index 1e66c088c085d1b39b4cf5a82af7e6322c6edc5b..1172cc70fe77b01730df4c7ae1318e690d88af46 100644
--- a/l10n/ru_RU/lib.po
+++ b/l10n/ru_RU/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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-04 02:29+0200\n"
+"PO-Revision-Date: 2013-06-03 00:32+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index ae35207a00ceba4357726f3ee4567784912a47bc..d90c370aac30adcdf0cac3d1165094d56bfca173 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 96681697da4ddf93282a82be035ad81290a88105..da3621476111cd35606ec2ba61a8e810b0e672c9 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr "යොමුව හිස් විය නොහැක"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "දෝෂයක්"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "නම"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "ප්‍රමාණය"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "වෙනස් කළ"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 ෆොල්ඩරයක්"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 ගොනුවක්"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/si_LK/files_encryption.po b/l10n/si_LK/files_encryption.po
index 02b12790e76fd96ce318a04bb0ae6abf8c6388c8..84f75679b39af72ff86954ce8efd2fe06c975279 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "සුරැකෙමින් පවතී..."
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 73a6fe826e69c57498a05afb2b629cf9a9aeda06..c8a65d793df8a3e04f0cd473fe10a04d5d8503f0 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 8f47f1b79b7944dcc07becb00181c755a1593242..c692d99227a4f0ed88402bb9fe9ab7e8966ef4d6 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 e024e00af13958c6b3cfd82668a69fb6b03ba4d3..ffdf208d5b37f2a23e1d4db953597b6d7722dcb5 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 ad9f12b9f82f77384c0ea16265b00ce936f59c60..1ee104b8966194c04c3bba66e372e2b082f35295 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 64e42fb142b07bbf1346fe664048f218f95d4a66..34cfc0f75dbcb9c2bbd9eaf3b74a66e2a5c83c6a 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "පරිශීලක නම"
+
+#: 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 bf7836dc057fdac6dc42255bb6e7ec27fe71efd5..0fd859b20363bcb1a20c8cda39bb675022ad0999 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 50163948c6c648c760abbc582de5aa7a4db20171..f9745043cb11894738885d7d7b4e45532c64a821 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 fa7bfd1c9efe79167e3de8774df0739ef7fddd04..445c6c56a600a8186b1e525ec867988160cd24af 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-20 02:37+0200\n"
+"PO-Revision-Date: 2013-06-20 00:37+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: 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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 b91e38b4ebf15d8980ae62451b6e879c2f243314..b5eb32b87c25e7bb3b44a2955fd3932b1fdda6d9 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 489876c2baa239e0312b17f1a4e55392a18aba53..c4a1511387b5df3c6fb3b916ae37eb134bffd369 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 09d08c8666ae8b12d490ac17261f8c2a2c200635..f5acdcadf80858b203c6cb22551a043e60634d05 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-20 02:37+0200\n"
+"PO-Revision-Date: 2013-06-20 00:37+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\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:105
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:108
+#: 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:68
+#: templates/personal.php:74
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:96
+#: 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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr ""
+
+#: 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 7eac54f7db7adbbda009f2a746536d514912230e..6704af8cc4133dc732429a89f98cc4e1f07be137 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 240ecf0a883f8cd3d006e23685bd1ae1cbfc01a1..79e8f21840fbc7f8d81c208845690cdb70aff91c 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -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 "%s s Vami zdieľa »%s«"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -217,23 +198,23 @@ msgstr "pred rokmi"
 msgid "Choose"
 msgstr "Výber"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: 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 ""
+msgstr "Chyba pri načítaní šablóny výberu súborov"
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Áno"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Nie"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "Áno, želám si teraz obnoviť svoje heslo"
+
+#: lostpassword/templates/lostpassword.php:27
 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 "Ahoj,\n\nChcem Vám oznámiť, že %s s Vami zdieľa %s.\nPozrieť si to môžete tu: %s\n\nVďaka"
+
+#: 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 "Ahoj,<br><br>chcem Vám oznámiť, že %s s Vami zdieľa %s.\nPozrieť si to môžete tu: <br><a href=\"%s\">zde</a>.<br><br>Vďaka"
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "späť"
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index f3446dad3f47e2b28780548401543dc30207a78f..031de089cfcfda1838ca7da0347e5dc357709f87 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -184,35 +184,35 @@ msgstr "URL nemôže byť prázdne"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Neplatné meno priečinka. Používanie mena 'Shared' je vyhradené len pre Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Chyba"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Názov"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Veľkosť"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Upravené"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 priečinok"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} priečinkov"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 súbor"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} súborov"
 
diff --git a/l10n/sk_SK/files_encryption.po b/l10n/sk_SK/files_encryption.po
index f0b5225a7cb90f01e21ba2bbaff260e89d0064a1..82b454013d5926e6c7a9aa20abf8340229099f18 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -20,21 +20,21 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Záchranný kľúč bol úspešne povolený"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Nepodarilo sa povoliť záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!"
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Záchranný kľúč bol úspešne zakázaný"
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Nepodarilo sa zakázať záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!"
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
@@ -42,63 +42,130 @@ msgstr "Heslo úspešne zmenené."
 
 #: ajax/changeRecoveryPassword.php:51
 msgid "Could not change the password. Maybe the old password was not correct."
+msgstr "Nemožno zmeniť heslo. Pravdepodobne nebolo staré heslo zadané správne."
+
+#: ajax/updatePrivateKeyPassword.php:51
+msgid "Private key password successfully updated."
+msgstr "Heslo súkromného kľúča je úspešne aktualizované."
+
+#: ajax/updatePrivateKeyPassword.php:53
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr "Nemožno aktualizovať heslo súkromného kľúča. Možno nebolo staré heslo správne."
+
+#: 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áš súkromný kľúč je neplatný. Možno bolo Vaše heslo zmenené z vonku. Môžete aktualizovať heslo súkromného kľúča v osobnom nastavení na opätovné získanie prístupu k súborom"
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Ukladám..."
 
+#: templates/invalid_private_key.php:5
+msgid ""
+"Your private key is not valid! Maybe the your password was changed from "
+"outside."
+msgstr "Váš súkromný kľúč je neplatný. Možno bolo Vaše heslo zmenené z vonku."
+
+#: 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 "osobné nastavenia"
+
 #: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
-msgstr "Zmeniť šifrovacie heslo obnovovacieho kľúča:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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:"
-msgstr ""
-
 #: templates/settings-personal.php:11
+msgid "Your private key password no longer match your log-in password:"
+msgstr "Vaše heslo súkromného kľúča je rovnaké ako Vaše prihlasovacie heslo:"
+
+#: templates/settings-personal.php:14
+msgid "Set your old private key password to your current log-in password."
+msgstr "Nastavte si staré heslo súkromného kľúča k Vášmu súčasnému prihlasovaciemu heslu."
+
+#: templates/settings-personal.php:16
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr "Ak si nepamätáte svoje staré heslo, môžete požiadať správcu o obnovenie svojich súborov."
+
+#: templates/settings-personal.php:24
+msgid "Old log-in password"
+msgstr "Staré prihlasovacie heslo"
+
+#: templates/settings-personal.php:30
+msgid "Current log-in password"
+msgstr "Súčasné prihlasovacie heslo"
+
+#: templates/settings-personal.php:35
+msgid "Update Private Key Password"
+msgstr "Aktualizovať heslo súkromného kľúča"
+
+#: templates/settings-personal.php:45
+msgid "Enable password recovery:"
+msgstr "Povoliť 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"
-msgstr ""
+"files in case of password loss"
+msgstr "Povolenie Vám umožní znovu získať prístup k Vašim zašifrovaným súborom, ak stratíte heslo"
 
-#: 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 637feb1c20cbe72229076266218ef9690297d584..1e74ef99333e597642f961e71ab9074637be3ab1 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 cb69a040d959dda1cb35129e6a16f85604ddb8bd..0292e541077014198754372b97f1a4f2cd1e45f8 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 28114d1724b98ab727699798850a5e954164025c..3a8a680f289f1e1b3c8e09e301ed2e60534ff796 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 abc90e244260e803b16d279c764426be36c8d1c2..10e0f7ec21a35d01fd01546c1e6a3516ac1b034c 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 85f9ff21ce813647300255c8c79d1993f2ab1708..3b296582a89a8207afd55459f41a757ed5363d9b 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
@@ -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
 msgid "Login Name"
 msgstr "Prihlasovacie meno"
 
@@ -464,34 +464,44 @@ 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 "Zadajte heslo pre obnovenie súborov používateľa pri zmene hesla"
+
+#: 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:84
+msgid "Username"
+msgstr "Meno používateľa"
+
+#: 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 b0224011f40d9ecb25cb0ef2bce2b8107f963638..20c80449a9cdc89e49677d36b44213ae97cd2a60 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
@@ -386,7 +386,7 @@ msgstr "UUID atribút:"
 
 #: templates/settings.php:107
 msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "Mapovanie názvov LDAP používateľských mien"
 
 #: templates/settings.php:108
 msgid ""
@@ -405,11 +405,11 @@ msgstr ""
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "Zrušiť mapovanie LDAP používateľských mien"
 
 #: templates/settings.php:109
 msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "Zrušiť mapovanie názvov LDAP skupín"
 
 #: templates/settings.php:111
 msgid "Test Configuration"
diff --git a/l10n/sk_SK/user_webdavauth.po b/l10n/sk_SK/user_webdavauth.po
index b0cb3100e75ec1b3fb97fd269469b2cb9bbd1ae2..ae90bb92d46978e69d8399ee96d4a3fd06f8efde 100644
--- a/l10n/sk_SK/user_webdavauth.po
+++ b/l10n/sk_SK/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-21 08:49+0200\n"
+"PO-Revision-Date: 2013-06-20 17:30+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,8 +24,8 @@ msgid "WebDAV Authentication"
 msgstr "WebDAV overenie"
 
 #: templates/settings.php:4
-msgid "URL: http://"
-msgstr "URL: http://"
+msgid "URL: "
+msgstr "URL: "
 
 #: templates/settings.php:7
 msgid ""
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 8fbe23e5360f1e1a82e05cce10c211c67ad69ebb..3bde3a9618a59c5a4db3395ae890cbba9d6b5dfb 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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."
@@ -217,23 +198,23 @@ msgstr "let nazaj"
 msgid "Choose"
 msgstr "Izbor"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: 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 "Da"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Ne"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "V redu"
 
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 aa07ee986036434b0dadb0a3755cdaba7156ed1a..5c3ee02506c4bcedab622591a811966e24a51347 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr "Naslov URL ne sme biti prazna vrednost."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Neveljavno ime mape. Uporaba oznake \"Souporaba\" je zadržan za sistem ownCloud."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Napaka"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 mapa"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} map"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 datoteka"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} datotek"
 
diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po
index b690829c5b1cc1fc8d1e802ae651353a91cd0687..3b256579813f9999bed0d7b97f7ab9cc42c62a65 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 17bd9c211403aa0138ea0da957019b006469e364..1a077ab4058f1498af43fd9bdd001e9902692ba2 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 0a8734395c408b52814b4b68ed8be1ff3595aef3..ddf9328eb3f9e2ccadb41b385c8f5b3bdc94a718 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 5d5ab4fc15d6ce0cfe6b3ee121535f884cf9f545..58a0639be396c93b4e4ae2c5428793d09dc2e38b 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 9c96456cd2babc26c97b245b15668a5f43bd9083..8ce3264d1448738b60c08c292d9a6c1542a8d023 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 5fe4dff79e1b283e603e4d37fda0ea92e7a0da94..a25daf322809dce4f1fa36185a16916ea5cc8166 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr "Prijavno ime"
 
@@ -464,34 +464,44 @@ 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:84
+msgid "Username"
+msgstr "Uporabniško ime"
+
+#: 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 c6b3dec4e80cf12fb9e209f370254414da0aaa3d..fb976fa8eda374ca92831e978f7a351440abbfd2 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 1d6f802d7e014e1b959809fe333da5674f8ad92a..8dadab8687771cdc47f2a8f8521b786810fa0d50 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 588c201a1dfd2bb1d61be1cba89d64c228635cc2..c859d4089bb1d6dc288405d307b32e81101ebfdc 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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."
@@ -217,23 +198,23 @@ msgstr "vite më parë"
 msgid "Choose"
 msgstr "Zgjidh"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Anulo"
 
-#: 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 "Po"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Jo"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Në rregull"
 
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 724c3d496d263d2b0caf8cb63138c4a0f39e1f38..0bb091ddfe19446edd8c2d8e4f874f4e5f3814f6 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr "URL-i nuk mund të jetë bosh."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Emri i dosjes është i pavlefshëm. Përdorimi i \"Shared\" është i rezervuar nga Owncloud-i."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Veprim i gabuar"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Emri"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Dimensioni"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Modifikuar"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 dosje"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} dosje"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 skedar"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} skedarë"
 
diff --git a/l10n/sq/files_encryption.po b/l10n/sq/files_encryption.po
index bd48080f91fc44b2f22542a5c58f3563352d7ffe..ee8a55446d715d9bf42a1089a89ca5180b3482c0 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 8ce7fabac0f9e9ccfe63f28fac6b1f37ec1897a8..97bd48d0f4af4e54a2dee99ee082ca93c39fe599 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 4615a7ca8bd7b78139fd7ae48b637359f1b043e8..0f78a0428ca0807b7d67b8b93d90d5344c9a4115 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 5a1dfc686ec695cb8f75e5c6c7cab87016300a7d..9c51d0d918a2ccff568d762509a9a410f26895f8 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 ac05bfe236c2a9b3778e75fbbb25fa238e6fe354..bdce0babf2c69d5001de3b41da7b557bbc54b35b 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 ca60e24747551caf597b1f5423f674741ddc7c3d..2ddb2f8fb2db3eb775a92d9d79cd301319fb689f 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "Përdoruesi"
+
+#: 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 0b78efc5c470136224a38d60249bec899627410a..3e9e25c799f4b314e7c33daacb32de5b64c9ed47 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 2ffc70b6f16aefb4082758144bd725796c1c41e7..953547cd5912da6c7bbcec431cb3aaa0b90f0718 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 3bd4997a95fb40c7a9848ded4c10a7ae129e2db5..6f7fe3054fa40781bfd21a5c96cf4dfbe8fa50d3 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 1137159319524ea60a5312235e1b4e5d60db86e9..27b206e3b30e78f4bb3e33becfb10b85104275ed 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr "Адреса не може бити празна."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Неисправно име фасцикле. Фасцикла „Shared“ је резервисана за ownCloud."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Грешка"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Величина"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Измењено"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 фасцикла"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} фасцикле/и"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 датотека"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} датотеке/а"
 
diff --git a/l10n/sr/files_encryption.po b/l10n/sr/files_encryption.po
index 1c2c46e27c3f4ab431fc961cb386c26cc82c7f70..12bbd2915f1969fc9709c925fcfc69773d3d0208 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Чување у току..."
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 03af7666c7551501b03d91a03258735800743696..4fc8bfe2210713f5b024c48141d798b7d5d28659 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 a24d938a0bb9283d8f949b4e7a5d9e03bcecec77..7b6b712ad795f4b9ada5ff8db04638e3b44b1e0c 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 35c72b956b58f66b7927a772ace3909f15050a05..efab4ba7df85aea21e9ab2d79324b8fada6fa5a3 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 5bcd946dcfc3685a8081253093df67d00b4f0eb2..94ce49629ec3bfafacf25dd4a4c6c1a07b69934f 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 cb20f885bf10bd643670fa7665208c0cb8997737..0edacd55f8867096ad67a3b286a04a742599eac4 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
 msgid "Login Name"
 msgstr "Корисничко име"
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "Корисничко име"
+
+#: 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 830588c67a3a24cc61a9cedb0590bfa7d128364d..8f6660299ba716c1821a28f24c0e9ebf29ed59fa 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 30b3f69adc1f96ce8b6003cdea9595a0b86b0554..bff29cbe68597d5174b290f677efa31ff47b7e07 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 b9c766b03edc4c22ce28a031bf9b5f6a7d17b77d..7f2cbe42947ecb64b7445b9cf0154d174b0830f0 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
@@ -216,23 +197,23 @@ msgstr ""
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Otkaži"
 
-#: 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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 5e2fce754bd69f461892e151fcf973197ceceaf7..e1dfef82c022d0d54da462a75bb555727ced765c 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr ""
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Zadnja izmena"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/sr@latin/files_encryption.po b/l10n/sr@latin/files_encryption.po
index b5ee53a5544eef86b7b5a0c4766b949a43be87ff..39eac7317230d680420af8d0dabdd8c78f73cb79 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 6a60f8db63d18d668761b37a8439d90b0b2ff532..d4d6757e284e03092aa913d0521f4de330785540 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 5e3e65bfa29f1257b6a4bdf1a254cc3a8338609b..f10e3f4586cb71f8316f9e3ef926be3680d1eb9b 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 4801956125200a2605172302d47db38de739efa8..9563c8558ca8cedd86dc3a8858218af8f5760637 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 9171d92be73c6cbdf7bbf81b61da50ff4b613fdd..fb70bae00abec7a70cc17940aa6f96093bf05625 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 c9f8cd90bec616d50b67ed1df60d5edce730e60c..a03d4492b0549935950809dea55fa5604930093e 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "Korisničko ime"
+
+#: 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_ldap.po b/l10n/sr@latin/user_ldap.po
index fa87c1da98e9197cae156f57404edfe20a763157..b828fa148051718a4efeb22670c901417f9599a1 100644
--- a/l10n/sr@latin/user_ldap.po
+++ b/l10n/sr@latin/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:28+0000\n"
+"POT-Creation-Date: 2013-06-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sr@latin/user_webdavauth.po b/l10n/sr@latin/user_webdavauth.po
index 8a2eb941c19457633990317082a2438247fda32f..7c1b403c83b7682bbd897eca981afc84766deb3d 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 102f0f4997dae6a51a6201994af03af4a893d351..eb44e4ddb9611c84f6c8a4746468f6b71ac26c10 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -3,12 +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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -19,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."
@@ -216,23 +200,23 @@ msgstr "Ã¥r sedan"
 msgid "Choose"
 msgstr "Välj"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: 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 ""
+msgstr "Fel vid inläsning av filväljarens mall"
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Ja"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Nej"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Ok"
 
@@ -390,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:60
 msgid "ownCloud password reset"
 msgstr "ownCloud lösenordsåterställning"
 
@@ -405,11 +389,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 "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."
 
 #: lostpassword/templates/lostpassword.php:12
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "Begäran misslyckades!<br>Är du helt säker på att din e-postadress/användarnamn är korrekt?"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "You will receive a link to reset your password via Email."
@@ -420,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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "Ja, jag vill verkligen återställa mitt lösenord nu"
+
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "Begär återställning"
 
@@ -468,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"
@@ -560,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 ""
+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"
 
@@ -603,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 309717a6ab5061895dedbcc216e1f87bc257905a..e3ab3a8b0fa5d20a07badf94788b2d2040211fa1 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.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
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -146,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}%)"
@@ -183,41 +185,41 @@ msgstr "URL kan inte vara tom."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Ogiltigt mappnamn. Användande av 'Shared' är reserverat av ownCloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Fel"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Storlek"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Ändrad"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 mapp"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} mappar"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} filer"
 
 #: lib/app.php:53
 msgid "Invalid folder name. Usage of 'Shared' is reserved by ownCloud"
-msgstr ""
+msgstr "Ogiltigt mappnamn. Användning av 'Shared' är reserverad av ownCloud"
 
 #: lib/app.php:73
 msgid "Unable to rename file"
diff --git a/l10n/sv/files_encryption.po b/l10n/sv/files_encryption.po
index b6c142e6e098f0b7df64e54203e7365cf32014c7..6ea8d4ecf22dcbbd8298d3075654d7c0d35228c8 100644
--- a/l10n/sv/files_encryption.po
+++ b/l10n/sv/files_encryption.po
@@ -3,12 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# medialabs, 2013
+# medialabs, 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -19,85 +21,152 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Återställningsnyckeln har framgångsrikt aktiverats"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Kunde inte aktivera återställningsnyckeln. Vänligen kontrollera ditt lösenord för återställningsnyckeln!"
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Återställningsnyckeln har framgångsrikt inaktiverats"
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Kunde inte inaktivera återställningsnyckeln. Vänligen kontrollera ditt lösenord för återställningsnyckeln!"
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Ändringen av lösenordet lyckades."
 
 #: ajax/changeRecoveryPassword.php:51
 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"
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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 ""
+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 ""
+msgstr "Inaktiverad"
 
-#: templates/settings-admin.php:32
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 ""
+msgstr "Byt lösenord"
 
 #: 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 ""
+"files in case of password loss"
+msgstr "Genom att aktivera detta alternativ kommer du kunna återfå tillgång till dina krypterade filer om du skulle förlora/glömma ditt lösenord"
 
-#: templates/settings-personal.php:27
+#: templates/settings-personal.php:63
 msgid "File recovery settings updated"
-msgstr ""
+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 ""
+msgstr "Kunde inte uppdatera filåterställning"
diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po
index 1a259e127a9dde911fc9f6c394724cfba4551d84..8293e77ee146a245de87c4bdd4e5e5966d02aa73 100644
--- a/l10n/sv/files_external.po
+++ b/l10n/sv/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# medialabs, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
@@ -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>Varning:<b> Curl-stöd i PHP är inte aktiverat eller installerat. Montering av ownCloud / WebDAV eller GoogleDrive är inte möjligt. Vänligen be din administratör att installera det."
 
 #: templates/settings.php:3
 msgid "External Storage"
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index 1167bb13e25a90803865d4b21731d04d45f472e0..bbbe8d804afa1bb78e2e189abe55902fec122747 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 bd5cf20c8bef2a940a50ddda2dff3b56f1584a24..c06663ba391196b23391b30832a0249a09fd03ee 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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/files_versions.po b/l10n/sv/files_versions.po
index 0448134617cd23efdcf1c2794885def1a20c542d..ff6e4700fd6e7ad537e92cb506a188e5d6cc31ce 100644
--- a/l10n/sv/files_versions.po
+++ b/l10n/sv/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# medialabs <medialabs@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:28+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-08 02:03+0200\n"
+"PO-Revision-Date: 2013-06-07 09:20+0000\n"
+"Last-Translator: medialabs <medialabs@gmail.com>\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"
@@ -54,4 +55,4 @@ msgstr "Versioner"
 
 #: templates/history.php:20
 msgid "Revert a file to a previous version by clicking on its revert button"
-msgstr "Återställ en fil till en tidigare version genom att klicka på knappen"
+msgstr "Återställ en fil till en tidigare version genom att klicka på återställningsknappen"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index 0fa69189c89f278a9b4baa5d74f198dfc7b3289e..507f7fe2be258853ca04ab2c0b5893a2e6da430f 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# medialabs, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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"
@@ -17,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"
 
@@ -87,102 +88,102 @@ msgstr "Bilder"
 
 #: setup.php:34
 msgid "Set an admin username."
-msgstr ""
+msgstr "Ange ett användarnamn för administratören."
 
 #: setup.php:37
 msgid "Set an admin password."
-msgstr ""
+msgstr "Ange ett administratörslösenord."
 
 #: setup.php:55
 #, php-format
 msgid "%s enter the database username."
-msgstr ""
+msgstr "%s ange databasanvändare."
 
 #: setup.php:58
 #, php-format
 msgid "%s enter the database name."
-msgstr ""
+msgstr "%s ange databasnamn"
 
 #: setup.php:61
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s du får inte använda punkter i databasnamnet"
 
 #: setup.php:64
 #, php-format
 msgid "%s set the database host."
-msgstr ""
+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 ""
+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 ""
+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 ""
+msgstr "Oracle-anslutning kunde inte etableras"
 
-#: setup.php:237
+#: setup.php:234
 msgid "MySQL username and/or password not valid"
-msgstr ""
+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 ""
+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 ""
+msgstr "Det felaktiga kommandot var: \"%s\""
 
-#: setup.php:308
+#: setup.php:305
 #, php-format
 msgid "MySQL user '%s'@'localhost' exists already."
-msgstr ""
+msgstr "MySQL-användaren '%s'@'localhost' existerar redan."
 
-#: setup.php:309
+#: setup.php:306
 msgid "Drop this user from MySQL"
-msgstr ""
+msgstr "Radera denna användare från MySQL"
 
-#: setup.php:314
+#: setup.php:311
 #, php-format
 msgid "MySQL user '%s'@'%%' already exists"
-msgstr ""
+msgstr "MySQl-användare '%s'@'%%' existerar redan"
 
-#: setup.php:315
+#: setup.php:312
 msgid "Drop this user from MySQL."
-msgstr ""
+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 ""
+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 ""
+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 ""
+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 7df94e6cf6145da515d8981870b7c9b17980ccff..6a21f615f4772cf1310997f1b3506d4cef016496 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -3,12 +3,16 @@
 # 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
@@ -28,7 +32,7 @@ msgstr "Fel vid autentisering"
 
 #: ajax/changedisplayname.php:31
 msgid "Your display name has been changed."
-msgstr ""
+msgstr "Ditt visningsnamn har ändrats."
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
@@ -58,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"
 
@@ -86,11 +90,11 @@ 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}"
-msgstr "Uppdaterar till {appversion}"
+msgstr "Uppdatera till {appversion}"
 
 #: js/apps.js:36 js/apps.js:76
 msgid "Disable"
@@ -136,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"
 
@@ -209,7 +213,7 @@ msgstr "PHP-modulen 'fileinfo' saknas. Vi rekommenderar starkt att aktivera den
 
 #: templates/admin.php:58
 msgid "Locale not working"
-msgstr ""
+msgstr "Locale fungerar inte"
 
 #: templates/admin.php:63
 #, php-format
@@ -217,11 +221,11 @@ 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 ""
+msgstr "Denna ownCloud server kan inte sätta system locale till %s. Det innebär att det kan vara problem med vissa tecken i filnamnet. Vi vill verkligen rekommendera att du installerar nödvändiga paket på ditt system för att stödja %s."
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
-msgstr ""
+msgstr "Internetförbindelsen fungerar inte"
 
 #: templates/admin.php:78
 msgid ""
@@ -231,7 +235,7 @@ msgid ""
 "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 ""
+msgstr "Den här ownCloudservern har ingen fungerande internetförbindelse. Det innebär att några funktioner som t.ex. att montera externa lagringsplatser, meddelanden om uppdateringar eller installation av tredjepartsappar inte fungerar. Det kan vara så att det inte går att få fjärråtkomst till filer och att e-post inte fungerar. Vi rekommenderar att du tillåter internetåtkomst för den här servern om du vill ha tillgång till alla funktioner hos ownCloud"
 
 #: templates/admin.php:92
 msgid "Cron"
@@ -295,18 +299,18 @@ msgstr "Säkerhet"
 
 #: templates/admin.php:181
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "Kräv HTTPS"
 
 #: templates/admin.php:182
 msgid ""
 "Enforces the clients to connect to ownCloud via an encrypted connection."
-msgstr ""
+msgstr "Tvingar klienter att ansluta till ownCloud via en krypterad förbindelse."
 
 #: templates/admin.php:185
 msgid ""
 "Please connect to this ownCloud instance via HTTPS to enable or disable the "
 "SSL enforcement."
-msgstr ""
+msgstr "Vänligen anslut till denna instans av ownCloud via HTTPS för att aktivera/avaktivera SSL"
 
 #: templates/admin.php:195
 msgid "Log"
@@ -324,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 "
@@ -336,29 +340,29 @@ msgid ""
 "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 "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kommunity</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>."
+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"
 
@@ -368,7 +372,7 @@ msgstr "Användardokumentation"
 
 #: templates/help.php:6
 msgid "Administrator Documentation"
-msgstr "Administratördokumentation"
+msgstr "Administratörsdokumentation"
 
 #: templates/help.php:9
 msgid "Online Documentation"
@@ -386,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 appar för att synkronisera dina filer"
+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 "Visat namn"
+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
 msgid "Login Name"
 msgstr "Inloggningsnamn"
 
@@ -463,34 +467,44 @@ msgstr "Inloggningsnamn"
 msgid "Create"
 msgstr "Skapa"
 
-#: templates/users.php:34
+#: templates/users.php:36
 msgid "Admin Recovery Password"
-msgstr ""
+msgstr "Admin återställningslösenord"
+
+#: 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:38
+#: 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:84
+msgid "Username"
+msgstr "Användarnamn"
+
+#: templates/users.php:91
 msgid "Storage"
 msgstr "Lagring"
 
-#: templates/users.php:98
+#: templates/users.php:102
 msgid "change display name"
-msgstr "ändra visat namn"
+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 801f38e6f451e2a16dc66fccba8f4b6ae1ef27b3..2ec1cd887678e47882735c4557cfe309108f28ff 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
@@ -19,7 +21,7 @@ msgstr ""
 
 #: ajax/clearMappings.php:34
 msgid "Failed to clear the mappings."
-msgstr ""
+msgstr "Fel vid rensning av mappningar"
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
@@ -59,7 +61,7 @@ msgstr "Kunde inte lägga till serverinställning"
 
 #: js/settings.js:111
 msgid "mappings cleared"
-msgstr ""
+msgstr "mappningar rensade"
 
 #: js/settings.js:112
 msgid "Success"
@@ -342,7 +344,7 @@ msgstr "Lämnas tomt för användarnamn (standard). Ange annars ett LDAP/AD-attr
 
 #: templates/settings.php:101
 msgid "Internal Username"
-msgstr ""
+msgstr "Internt Användarnamn"
 
 #: templates/settings.php:102
 msgid ""
@@ -358,15 +360,15 @@ msgid ""
 "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 ""
+msgstr "Som standard skapas det interna användarnamnet från UUID-attributet. Det säkerställer att användarnamnet är unikt och tecken inte behöver konverteras. Det interna användarnamnet har restriktionerna att endast följande tecken är tillåtna:  [ a-zA-Z0-9_.@- ]. Andra tecken blir ersatta av deras motsvarighet i ASCII eller utelämnas helt. En siffra kommer att läggas till eller ökas på vid en kollision. Det interna användarnamnet används för att identifiera användaren internt. Det är även förvalt som användarens användarnamn i ownCloud. Det är även en port för fjärråtkomst, t.ex. för alla *DAV-tjänster. Med denna inställning kan det förvalda beteendet åsidosättas. För att uppnå ett liknande beteende som innan ownCloud 5, ange attributet för användarens visningsnamn i detta fält. Lämna det tomt för förvalt beteende. Ändringarna kommer endast att påverka nyligen mappade (tillagda) LDAP-användare"
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
-msgstr ""
+msgstr "Internt Användarnamn Attribut:"
 
 #: templates/settings.php:104
 msgid "Override UUID detection"
-msgstr ""
+msgstr "Åsidosätt UUID detektion"
 
 #: templates/settings.php:105
 msgid ""
@@ -377,15 +379,15 @@ msgid ""
 "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 ""
+msgstr "Som standard upptäcker ownCloud automatiskt UUID-attributet. Det UUID-attributet används för att utan tvivel identifiera LDAP-användare och grupper. Dessutom kommer interna användarnamn skapas baserat på detta UUID, om inte annat anges ovan. Du kan åsidosätta inställningen och passera ett attribut som du själv väljer. Du måste se till att attributet som du väljer kan hämtas för både användare och grupper och att det är unikt. Lämna det tomt för standard beteende. Förändringar kommer endast att påverka nyligen mappade (tillagda) LDAP-användare och grupper."
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
-msgstr ""
+msgstr "UUID Attribut:"
 
 #: templates/settings.php:107
 msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "Användarnamn-LDAP User Mapping"
 
 #: templates/settings.php:108
 msgid ""
@@ -400,15 +402,15 @@ msgid ""
 "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 ""
+msgstr "ownCloud använder sig av användarnamn för att lagra och tilldela (meta) data. För att exakt kunna identifiera och känna igen användare, kommer varje LDAP-användare ha ett internt användarnamn. Detta kräver en mappning från ownCloud-användarnamn till LDAP-användare. Det skapade användarnamnet mappas till UUID för LDAP-användaren. Dessutom cachas DN  samt minska LDAP-interaktionen, men den används inte för identifiering. Om DN förändras, kommer förändringarna hittas av ownCloud. Det interna ownCloud-namnet används överallt i ownCloud. Om du rensar/raderar mappningarna kommer att lämna referenser överallt i systemet. Men den är inte konfigurationskänslig, den påverkar alla LDAP-konfigurationer! Rensa/radera aldrig mappningarna i en produktionsmiljö. Utan gör detta endast på i testmiljö!"
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "Rensa Användarnamn-LDAP User Mapping"
 
 #: templates/settings.php:109
 msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "Rensa Gruppnamn-LDAP Group Mapping"
 
 #: templates/settings.php:111
 msgid "Test Configuration"
diff --git a/l10n/sv/user_webdavauth.po b/l10n/sv/user_webdavauth.po
index ec341c54811f9aa9daaafe6e76d40421827fbc25..e8848e9ada136be51509bb64e580867b212426a3 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 ee5e620265e4c695f286e592c152102846096632..684e3ec49c6f76409102499d9bbe66b76faeee41 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-20 02:37+0200\n"
+"PO-Revision-Date: 2013-06-20 00:37+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: 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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 181a2ef29a7becbe075aefd8f67be2ce1975bb4d..eb70a89e188fca6532c5d4af3a9c8d403a649bec 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 486d565277c4b30b73f480ce4a037eb8a2e31cd4..aa7674bece00fe3c00bc354121cbd40a3f782c46 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 a8fd5f1a2c26f0715fd0f162e4bc10ab66420211..01bbab7a24816eb9191fbd5e4f98074dfdd1c287 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-20 02:37+0200\n"
+"PO-Revision-Date: 2013-06-20 00:37+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\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:105
+#: templates/admin.php:235 templates/personal.php:116
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:237 templates/personal.php:108
+#: 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:68
+#: templates/personal.php:74
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:70
+#: templates/personal.php:76
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:71
+#: templates/personal.php:77
 msgid "Fill in an email address to enable password recovery"
 msgstr ""
 
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:86 templates/personal.php:87
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:89
+#: templates/personal.php:99
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:105
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:96
+#: 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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr ""
+
+#: 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 b41a7fe5abf1ffbefb9edfeadcb7aab14c7b2972..f37c585e1edd97b26d532d128556f8e4f8b10c0a 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 541f25775e4d9a36752fd458836a732e513c946c..de4b95d8dfc231bcd98a4c2c153acf3e676f807c 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 84c0f1c55847e381dacade1a4b3127ed52501032..fcf558d7b338f6c90f844d8b3f02b8c2ee4a7c3a 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr "URL  வெறுமையாக இருக்கமுடியாத
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "வழு"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "பெயர்"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "அளவு"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "மாற்றப்பட்டது"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 கோப்புறை"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{எண்ணிக்கை} கோப்புறைகள்"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 கோப்பு"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{எண்ணிக்கை} கோப்புகள்"
 
diff --git a/l10n/ta_LK/files_encryption.po b/l10n/ta_LK/files_encryption.po
index 48fb2ff2275a2bac18f4e26b39b37c7bf76cb053..9991449473b70265190bd050ed2fd786622d793a 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "சேமிக்கப்படுகிறது..."
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 ee9a204685d0b829ecaf3c4885eead0a43f4a329..91c73433118b7c2273d8b7d7f112aa235c6f49e8 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 68673ba7d68d7c60ec9248fe6984e2ec21676e4a..fa992fcda399e9014a84c44189d317c00206f8f8 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 d6637a6e81c5beeffb8d0a703726d57e9ea89e05..e9dbed5ce593e173572030efd4dcd943292c1851 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 f655192b5368408ba7da5b80a55d1237ddf3e755..f3723f122f27d32763876e4c7bb2fe6bbc67bdf9 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 b10ecfa38b7f838e7773dea75731e963afe2b6cf..0e962dc0c4f0d75b7ba7096f09861314c7b11df2 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "பயனாளர் பெயர்"
+
+#: 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 c1e4d13f30cf844bb26b2bc013b6e9be612628ad..20cebcc840408b7776a5a4cae1ba6d15122b88a4 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 fa5d31237c3420d1cd62a0bfb56bd9eb9752ec82..143001981c695e00c32a7a2ebdb1961466df38fd 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 d813185494962bc984a00542f94ef03834cfe0c3..ca0b7c1279a5b2b8092cb58575152eec72837b19 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 ed5e2b98335cecfbbaa1e1ffc6e6ccf0878f3dcd..e9399d377c91a0c0e872083836635e6e41445a5a 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "పొరపాటు"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "పేరు"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "పరిమాణం"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/te/files_encryption.po b/l10n/te/files_encryption.po
index 7ccbc51637f86133be83108c69dad1b676b31002..9161b529b8d3d1a2ea515957d946885f5450db81 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 41448bed38d004b828099bc705d4a464d97961d5..e23bc5a06a2cad2c8c0f7210f919b01ae5fbd77c 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 96195fcf7adb60d7a9785ee69b7ea37f93cef09c..c3710de1f2030d6feb4abd81558e9be6488dd0fb 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-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: 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 5511f5b83a7f47b9e674855c12e8df2f029134b2..183a3b5af12c4909351faf8a6b712773a604b6b8 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 b5399c9037d3a3a45b62923b99120e704eed565b..b0d30e54b9b37465e5492ea016237bc1c58ad861 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-02 02:01+0200\n"
-"PO-Revision-Date: 2013-06-02 00:02+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 00:14+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 59f9d4b82e9b66d40dd24247ac438ad741b9e3d8..3645b75885890ff1cb992427e59825e9b3ea6b9c 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "వాడుకరి పేరు"
+
+#: 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 f21c24d5a54b3bb6651cf0627fad78c4579ddb7a..5795cb7c3d3e272df0d31d86b2bb4887d65001e3 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 dac5225d9649091db96ed6a4a0c0d1da073de536..e586de734ddde2a2f03b7c6fcbbce63cb359baff 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 2ca3405b6b9e9b1da02194062001f27206b56cfa..d0440871c34e1b4890e4777adf2c94a23c7c80a6 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-03 02:27+0200\n"
+"POT-Creation-Date: 2013-06-26 02:00+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
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 d73ee78426bedb58606644dd5a1d42a20750a3ac..0e29168897c4a48915a753be1f349a467d4eef4b 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-03 02:27+0200\n"
+"POT-Creation-Date: 2013-06-26 01:59+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"
@@ -183,35 +183,35 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr ""
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 57857b20113ba63217a8a4de7ce8d815217a6b00..db3121dbd311fb8119b747ba8d6874c1d8c8223d 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-03 02:27+0200\n"
+"POT-Creation-Date: 2013-06-26 01:59+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,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 5ec83aef4a7072face3606b2eddda3c2b33e2440..7007062249fd619b402c37d095962e37ffa990f6 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-03 02:27+0200\n"
+"POT-Creation-Date: 2013-06-26 01:59+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 bac3501ca142c925b59d5e1060a281ab80950e4d..12b381fd721a5e9172a1431eae3521551d6148cc 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-03 02:27+0200\n"
+"POT-Creation-Date: 2013-06-26 01:59+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 3f1e20bc01d29f34e39f7894199e6f0c5582d3e9..31bfae35d985c045124153e4b9b33a20eec27383 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-03 02:27+0200\n"
+"POT-Creation-Date: 2013-06-26 01:59+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 b1074c24ceae36d1c71520fb759a4a04f5187ad1..13326efe046ed7574c5f7b5d04b05ddb18d68d2b 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-03 02:27+0200\n"
+"POT-Creation-Date: 2013-06-26 01:59+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 2e31c7de00044200e04da5e778654078d3bd6d17..7b9eb60885a926cdd84dbfdfe1d299071e9faa84 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-03 02:27+0200\n"
+"POT-Creation-Date: 2013-06-26 02:00+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 ed187b4342407f5807696abac6e51ae86d2f3880..177a75f01e1ee5dbd7e10ef295dad0e066b942fa 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-03 02:27+0200\n"
+"POT-Creation-Date: 2013-06-26 02:00+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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr ""
+
+#: 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 ee5c2cf2347b0fcc94e7327abfce65fe66d35d86..9479b50b68cae47144fec7cd2c6ddbcfdf981b57 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-03 02:27+0200\n"
+"POT-Creation-Date: 2013-06-26 01:59+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 53e61979192e0b8a8ebfd63fa193f6af3faadf1c..e6d1550b779f2be0a3ecafe99231f75348c31cb3 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-03 02:27+0200\n"
+"POT-Creation-Date: 2013-06-26 01:59+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 b88b3cc9248f7b667274da7f877741df6c946863..3a3393804f66a21df1c90ce99cac633b8fab85de 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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."
@@ -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 "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้"
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 ccfa0c5ddde6475475d76a4f3c3c172dde462092..61815d1e936084bb208c6045f8e534e47aa40d6d 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr "URL ไม่สามารถเว้นว่างได้"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ชื่อโฟลเดอร์ไม่ถูกต้อง การใช้งาน 'แชร์' สงวนไว้สำหรับ Owncloud เท่านั้น"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "ชื่อ"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "ขนาด"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "แก้ไขแล้ว"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 โฟลเดอร์"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} โฟลเดอร์"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 ไฟล์"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} ไฟล์"
 
diff --git a/l10n/th_TH/files_encryption.po b/l10n/th_TH/files_encryption.po
index c52fe69a4c4ce19c16992bba2ff01312768d7509..8c51854d4a10d62f1428d35337beea6ecb9817af 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "กำลังบันทึกข้อมูล..."
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 b8329a6124b2898d6b284942f7feec8653600343..4341cd5cf42d9ffb6d207ba032ca51ad20157231 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 49c70f024bf7c8d204ecb9eac6dd2c49dbbd0b10..cf172ba893e8df1ebdf0d41b89aa89047415cc51 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 bfcb4d2f46d98a65d7bf5aceac6f74ab584fd05b..39875c6c05274564e5bfdfaa32c42df26bf0ce39 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 131dfe7946a13974b65974bbb97aed7044632c03..9ffcadec3d64b34388c125a15ee46b0c96fdc729 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 3f942a49f7505a9e35e7f677511d6e5fb8805386..0ab25361c6a8a1b03b6191ef54c3c0f50db2476d 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr "ชื่อที่ใช้สำหรับเข้าสู่ระบบ"
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "ชื่อผู้ใช้งาน"
+
+#: 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 53635d7dc984f4d78ab28a8b9bcd484da3fdd48d..93493763a77e0ab0ef64265ce5143ec72268c2a9 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 af83ef0d0060b2434360e33667e3cbd4ba5261b1..08cda589473a7ea106f6c918122aa1b92c451874 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 c4abde428187bc22825930cca9679fc984894e71..4e66cbc4cfd804b31c6bad30b6e5d02ab8cd926b 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: ismail yenigül <ismail.yenigul@surgate.com>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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."
@@ -217,23 +198,23 @@ msgstr "yıl önce"
 msgid "Choose"
 msgstr "seç"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Ä°ptal"
 
-#: 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 ""
+msgstr "Seçici şablon dosya yüklemesinde hata"
 
-#: js/oc-dialogs.js:161
+#: js/oc-dialogs.js:164
 msgid "Yes"
 msgstr "Evet"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Hayır"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Tamam"
 
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 0b0da38b58edf1e69ba4f4b739f2ce295bf8cdc1..cc38053168b788ff419c4c57559f9783a39861c7 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -184,35 +184,35 @@ msgstr "URL boÅŸ olamaz."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Geçersiz dizin adı. Shared isminin kullanımı Owncloud tarafından rezerver edilmiştir."
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Hata"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Ä°sim"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Boyut"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "DeÄŸiÅŸtirilme"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 dizin"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} dizin"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 dosya"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} dosya"
 
diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po
index 82ddb74c5d7030a94513d502522e6486ece32d6f..723756c800526a9f0e920baef2602e3ea473fa86 100644
--- a/l10n/tr/files_encryption.po
+++ b/l10n/tr/files_encryption.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# ismail yenigül <ismail.yenigul@surgate.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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,85 +20,152 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Kurtarma anahtarı başarıyla etkinleştirildi"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Kurtarma anahtarı etkinleştirilemedi. Lütfen kurtarma anahtarı parolanızı kontrol edin!"
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Kurtarma anahtarı başarıyla devre dışı bırakıldı"
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Kurtarma anahtarı devre dışı bırakılamadı. Lütfen kurtarma anahtarı parolanızı kontrol edin!"
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Şifreniz başarıyla değiştirildi."
 
 #: ajax/changeRecoveryPassword.php:51
 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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 ""
+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 ""
+msgstr "Devre dışı"
 
-#: templates/settings-admin.php:32
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:51
+#: templates/settings-admin.php:53
 msgid "Change Password"
+msgstr "Parola deÄŸiÅŸtir"
+
+#: 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 "Dosya kurtarma ayarları güncellendi"
 
-#: templates/settings-personal.php:28
+#: templates/settings-personal.php:64
 msgid "Could not update file recovery"
-msgstr ""
+msgstr "Dosya kurtarma güncellenemedi"
diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po
index 4d0e704f51317d65c831fabc0919fafa69dd9c77..418f0a3bcd7c3067184f1c3411557a2758bbf7f5 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 8a76095d7ef6c1c15bc33df20e2294e178d846da..e2294c4fedac072abf37fbc913dbd0e833a12cef 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 254222c64b562096b7f93d7ef60c364f361cab34..188c11017a2acf759156743d1082bae09706bb97 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 14242b6ae81f811f7ec5566c6174271f192380cc..f21d2dd4370d66cc4ec7ad51757727f7cb594814 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 ""
+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 7b467a0b707428cc424465165c65e03d6e942a30..6a3b63dc04657850f3487c736fdbc0523442c535 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
@@ -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
 msgid "Login Name"
 msgstr "Giriş Adı"
 
@@ -464,34 +464,44 @@ 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: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 "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:84
+msgid "Username"
+msgstr "Kullanıcı Adı"
+
+#: 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 dabf4606c8e9dbf1ca38ee92ee860e4eb0399594..7ba362672128599cbb04e6f77df3f013f44b4ff0 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 03ee4902c8e8ff8ac92401437edeabd04fedbf84..5e69022bb6ee26cbe0e7920fad1773bbe77802b6 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 15e214f02f3207c674257dc68b99c4d844425166..6089b3606d89e38a8c3c5875b6346e5c9857ea31 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 48bf941b88fcd3d8aed356e366f4878381735857..a73cbb01acdab0b6f7e84a2a0f922f84c0015a96 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -183,35 +183,35 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "خاتالىق"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "ئاتى"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "چوڭلۇقى"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "ئۆزگەرتكەن"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 قىسقۇچ"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 ھۆججەت"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} ھۆججەت"
 
diff --git a/l10n/ug/files_encryption.po b/l10n/ug/files_encryption.po
index e3519652c883818b8cdb306914ffcbb687c56ec6..2241b0b8106b8b3468c1c0574b21153734d22ded 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Uighur <uqkun@outlook.com>\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "ساقلاۋاتىدۇ…"
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 0f35adf4321f29baeb5d277dc55f93d7e6ae2e30..bd5ffff3a2211c082f4609f9a5c6542437d7082a 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 5958fbcb41b184998e1086b5a68f2a61481fbd54..28bc0bfd755878c177ae16fb3ee442aca218f662 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
-"Last-Translator: uqkun <uqkun@outlook.com>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 7442a2e88774ce964c7474b9ee67edc97b90c59a..0684a53b3fb459aa973edb053aac03b7f14abc88 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 eb6d5ef54ba5a969dd537ae2372125673a441902..2aceb7019ec1f7b33f2e0a8b6f897d35fe4f07e1 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 2b56b400e9021047e7029f4606dc2ed985a21633..d8b3c96b2b7325988ac7f67bb412184cafdb7d20 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr "تىزىمغا كىرىش ئاتى"
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "ئىشلەتكۈچى ئاتى"
+
+#: 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 a4e5eec6d2beb5a1be26ccf9a1b4bafed663a3e3..a6fb13c8f0cdc1b059cf6f70e8bfc53a725df3ca 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 544a8b946eddd0197cb3d989c8cff1d899daf762..ebca1d6ca9bb3758004a789def304d807541bec7 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 da8ecc080471b7448a9425f3ccf2eae1013d5fd2..4dea6f8b180ed283f4e5340ff0452050cb103c6c 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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."
@@ -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 "Ok"
 
@@ -392,7 +373,7 @@ msgstr "Оновлення виконалось неуспішно. Будь л
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Оновлення виконалось успішно. Перенаправляємо вас на  ownCloud."
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 9c95991d399b43c0b3a92eae896d5b95210f749f..008c0f85f18cd36c85812dc7c1226ece8a5f5733 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr "URL не може бути пустим."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Невірне ім'я теки. Використання \"Shared\" зарезервовано Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Помилка"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Ім'я"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Розмір"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Змінено"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} папок"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} файлів"
 
diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po
index ea28d0078fa239940b7f0f8e79e542717cc721b8..8248bcf64da0b72cb7dbe0527869511aebc905ae 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Зберігаю..."
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 c9962845ce8033e0afa43790e3f06d1bc45de71d..1b5e6a3f234336b188e14ee1f0b6acc76cb28301 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 c87feb1467fed032ea950803e5ffe1ae85194029..6232d2ee417ccd22b5248040f5fbd20312095ef6 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 bb0bb28ba04fe5b6c42ac986f5f74bce696bac3a..50805230f8d65d19cd81d7ef9ea663e78cd9005e 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 4dc6ec1cd378d5d307cf9274099c78fcbfc0b850..ea816a426dc87c04604e3bd18ecd513a30079691 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 8db859cb8388a725441bcdf140e1d866ed0e744b..370bbb936f3879864bde16fa25751ba993bf8cae 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr "Ім'я Логіну"
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "Ім'я користувача"
+
+#: 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 3be40699ea190ed18d5a24b97c66ef84f2b082cb..b70c1e423740c75831dc82a66942ed15a054594a 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 feb00291cb71e04cf311444d840b339e27e1768f..36cc099000a5894b424b40f26b9ca45703fe4050 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 c441267db06826ba812fe166bbb089627bb2ac5b..6cbc956d8cbe61e3d64ea959ccc651edbd951a61 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 9b22814bc59f8f715d6a2e6ee6c9aa1ebb91b641..18bde9e30a24285beed6f47ebd0b3f54c49bdfae 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "ایرر"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr ""
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/ur_PK/files_encryption.po b/l10n/ur_PK/files_encryption.po
index 7db2a58d18ab47dd95ea4c6606bfaa7e86318e78..3f2fe3adc376d08c621d4f55a560287ae352023d 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 a094fe6a21a49c2eb88742b5bf0b865e1125a76b..adb3e46b7b0b7ac8a3ea9fc0466a63007aa091a2 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-23 01:59+0200\n"
+"PO-Revision-Date: 2013-06-22 10:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: 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 528141e00bcb37f5f60c1b67701998f12e041984..a15724fbb66d2672846e944cb57c0e39f9068433 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 b30e9413266c210b428c2833975a05bf4c8cda14..1d699bc38a6ba257f7f7a4c1ca4a924011825529 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-02 02:01+0200\n"
-"PO-Revision-Date: 2013-06-02 00:02+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 cf1c409dc70b830469bb8bf5a769b635e9d4489c..6d887cd7d19d8795a727cce306f26365a0e1789d 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "یوزر نیم"
+
+#: 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 43aba3ef53903416ae28548df373505c97d392e3..8da1c6a159f58aa8d91737cafbf149537748612a 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 3082e6561fc97f1b82879dc67ff10b3c55f39f85..d401530efb3108c444338d1aaf49ff0a547bb8e3 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 5a04013a53cfabb70820646340282b1b938c156b..ab937a595ee88192113609fbdfd81866bac4393c 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: xtdv <truong.tx8@gmail.com>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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."
@@ -217,23 +198,23 @@ msgstr "năm trước"
 msgid "Choose"
 msgstr "Chọn"
 
-#: js/oc-dialogs.js:121
+#: js/oc-dialogs.js:122
 msgid "Cancel"
 msgstr "Hủy"
 
-#: 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 "Có"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "Không"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "Đồng ý"
 
@@ -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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 8bdcaa0c0f7f1dd05e3e0e32d9a132e30e8b4831..9087c7d8efc25942d568571ab46a387e5ef6dc1e 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -184,35 +184,35 @@ msgstr "URL không được để trống."
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "Lá»—i"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "Tên"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "Kích cỡ"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "Thay đổi"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 thư mục"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} thư mục"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 tập tin"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} tập tin"
 
diff --git a/l10n/vi/files_encryption.po b/l10n/vi/files_encryption.po
index b364dc18140262cb3a3f4ee4c61ab5bd5aa10612..b85ddb1e6964ea94ca65a5542fe0387d318fb422 100644
--- a/l10n/vi/files_encryption.po
+++ b/l10n/vi/files_encryption.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Tuấn Kiệt Hồ <hotuankiet_2000@yahoo.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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -37,67 +38,134 @@ msgstr ""
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Đã đổi mật khẩu."
 
 #: ajax/changeRecoveryPassword.php:51
 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "Đ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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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 ""
+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 ""
+msgstr "Tắt"
 
-#: templates/settings-admin.php:32
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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: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 ""
 
-#: 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 492533621477eae85e6f9495116218c2d4a86b08..e7b6e40ae3b6309a7e2738dfd52c5d83630b3637 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 417f805494172d4cf252c2d8ed443781b5490957..921957dacd59c96c82c762f7111fb73d5b7bc7da 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 0a195d4c7eb17f541ff40a7f8c60615d35f1bec9..89cefe5b3b9d58a7104079b5341ad80e1b66d270 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 1efe0d773ea6282f3a3e401ebd20d98744bbdfb8..6f3be6d060d15c0a64f63bef25470d30e5682cd0 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 f966fbdc43459462248529ae4d9b6527ac5995ce..665ca3aff96da5336909b5efa1fa86d08a81a4ca 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr "Tên đăng nhập"
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "Tên đăng nhập"
+
+#: 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 6bcc06b555706bb050a33e04c42149bfbb957b12..d41ff5365afbd0b06553b4394285ac3a28b865cf 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 e3cb6494d123096ff6eca9cc503b2b0f6a9834d2..bbcb7346fe5259dd5b3334718d4a92b7a458e9f9 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 b25ca2c7193607a69915870852871d60d67349eb..cabc3fa2cf7aeb03b8a1c341876eb468312b39bc 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -3,12 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# fkj <fengkaijia@gmail.com>, 2013
+# hyy0591 <yangyu.huang@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -19,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."
@@ -69,7 +52,7 @@ msgstr ""
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
 msgid "Error adding %s to favorites."
-msgstr ""
+msgstr "在添加 %s 到收藏夹时发生错误。"
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
@@ -78,7 +61,7 @@ msgstr "没有选中要删除的分类。"
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
 msgid "Error removing %s from favorites."
-msgstr ""
+msgstr "在移除收藏夹中的 %s 时发生错误。"
 
 #: js/config.php:34
 msgid "Sunday"
@@ -216,23 +199,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 +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:60
 msgid "ownCloud password reset"
 msgstr "私有云密码重置"
 
@@ -420,7 +403,19 @@ msgstr "你将会收到一个重置密码的链接"
 msgid "Username"
 msgstr "用户名"
 
-#: lostpassword/templates/lostpassword.php:21
+#: lostpassword/templates/lostpassword.php:22
+msgid ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 msgid "Request reset"
 msgstr "要求重置"
 
@@ -468,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 "编辑分类"
@@ -560,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 "注销"
 
@@ -593,7 +599,7 @@ msgstr "忘记密码?"
 
 #: templates/login.php:39
 msgid "remember"
-msgstr "备忘"
+msgstr "记住登录"
 
 #: templates/login.php:41
 msgid "Log in"
@@ -603,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 993200578185e9c385af2bf51e588ac0f705e3c8..7ea290bef6eaeb16fdb5edef959d87d99179b2ee 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr "网址不能为空。"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "出错"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "名称"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 个文件夹"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} 个文件夹"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 个文件"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} 个文件"
 
diff --git a/l10n/zh_CN.GB2312/files_encryption.po b/l10n/zh_CN.GB2312/files_encryption.po
index d98fa3d78b4c7cf637e04c8b0e403f95f47335d0..b03035e56f18502b8518eb0f3eedbf6f19b66f7c 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "保存中..."
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 ab7f4988e19740ae77a51239973ac032e2a9cf4a..27e3bb2f0332f377ea7b55621b81a84fc9fef689 100644
--- a/l10n/zh_CN.GB2312/files_external.po
+++ b/l10n/zh_CN.GB2312/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# hyy0591 <yangyu.huang@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
 "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>警告：</b> PHP 的 Curl 支持没有安装或打开。挂载 ownCloud、WebDAV 或 Google Drive 的功能将不可用。请询问您的系统管理员去安装它。"
 
 #: templates/settings.php:3
 msgid "External Storage"
diff --git a/l10n/zh_CN.GB2312/files_sharing.po b/l10n/zh_CN.GB2312/files_sharing.po
index a05eaaf358814c7894330cb0648a3171633d6b17..5ddada9bda511bd62a073a178111dfd273995caf 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 66526ba07455fe76c65cc60934c61257e1c9a1f1..03a068568dec7f6db541ce37cd5bcedc9aed4d1b 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 b0d6a02aceec7c6bb1fc7a3a71b7843d1780ed53..5f575f56efdbc408b965ff6419c97d4fdbc14195 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 dcff59eda7923a1e9337bbbc16acfeab1a40563b..6ec7f7cff767daa3fbf87dd87b7571fd9a3a56d4 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# hyy0591 <yangyu.huang@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -28,7 +29,7 @@ msgstr "验证错误"
 
 #: ajax/changedisplayname.php:31
 msgid "Your display name has been changed."
-msgstr ""
+msgstr "您的显示名称已修改"
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change display name"
@@ -58,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 "未能删除用户"
 
@@ -136,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 "删除"
 
@@ -199,13 +200,13 @@ msgstr "请双击<a href='%s'>安装向导</a>。"
 
 #: templates/admin.php:44
 msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "模块“fileinfo”丢失。"
 
 #: 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 ""
+msgstr "PHP 模块“fileinfo”丢失。我们强烈建议打开此模块来获得 mine 类型检测的最佳结果。"
 
 #: templates/admin.php:58
 msgid "Locale not working"
@@ -217,7 +218,7 @@ 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 ""
+msgstr "ownCloud 服务器不能把系统区域设置到 %s。这意味着文件名可内可能含有某些引起问题的字符。我们强烈建议在您的系统上安装必要的包来支持“%s”。"
 
 #: templates/admin.php:75
 msgid "Internet connection not working"
@@ -324,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 "
@@ -338,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 "æ›´æ–°"
 
@@ -386,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
 msgid "Login Name"
 msgstr "登录名"
 
@@ -463,34 +464,44 @@ 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:84
+msgid "Username"
+msgstr "用户名"
+
+#: 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 6b36fb523b1f6d202737bfb1aebbaea78e464ece..4c6b07207df61996ffc9a1bfbbdee80a160fc553 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 60e0c7b04498c5a127c865bf555dc601d02b0a04..0956f14fc261c1b22098e394d31bee65640a3dd8 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 5c79d471349182049752ba706b0756d4de5d55e4..7b713baa214de1035ff9120cb61a7961c240f08c 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: zhangmin <zm1990s@gmail.com>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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."
@@ -217,23 +198,23 @@ msgstr "年前"
 msgid "Choose"
 msgstr "选择(&C)..."
 
-#: 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 "更新不成功。请汇报将此问题汇报给  <a href=\"https://gith
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "更新成功。正在重定向至 ownCloud。"
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 a46d71b023ab5f9e8cd41fcd33e1c406b08a3eaa..1c792153cd3a2f0b553c1813b6b4156dbca4bae1 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -184,35 +184,35 @@ msgstr "URL不能为空"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "无效文件夹名。'共享' 是 Owncloud 预留的文件夹名。"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "错误"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "名称"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1个文件夹"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} 个文件夹"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 个文件"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} 个文件"
 
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index 11cd8aa05f3edcf72a17c0bc24791a3298f15bf8..99ed1e0e5fee00f728ebcf3957e4ab44fd84c489 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# modokwang <modokwang@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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -19,85 +20,152 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "恢复密钥成功启用"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "不能启用恢复密钥。请检查恢复密钥密码！"
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "恢复密钥成功禁用"
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
 msgstr ""
 
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "保存中"
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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 ""
+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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 ""
+msgstr "不能更新文件恢复"
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index 20aae7c898fc73770597928314db9f29792f6a76..94375cf1b8ac8002d8e58fc9ff514535fe43ba73 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 35fda472ffd0bf1011c695f92be5799ee45a5da7..111e094460e3e6f554c228926ef2acaee7b18425 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 e2735ae9035cc6f986be6d6ee7a38f11cc8bc77e..74bc91c661ed04d21e2f921655cba63f9fcd5b05 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 e4845047f21b1f52319872df367c2a2416a8fd11..e8e6179f1975fb99382d95b5cba8eb61aa8fdf70 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# modokwang <modokwang@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,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 "管理"
 
@@ -113,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 ""
+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 bf5e386cd3b2cc416c8aeb368f8db52b5344738b..976de08fc872f841683313cc6dca3744a73a1699 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# modokwang <modokwang@gmail.com>, 2013
 # zhangmin <zm1990s@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
@@ -59,7 +60,7 @@ msgstr "无效的电子邮件"
 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 "查看在 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 "æ›´æ–°"
 
@@ -387,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
 msgid "Login Name"
 msgstr "登录名称"
 
@@ -464,34 +465,44 @@ 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:84
+msgid "Username"
+msgstr "用户名"
+
+#: 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 cad853206bb5d04fa59cc484b072820dfc9118df..315a0ac33abc6d2be44c46bc621ae12485a86c52 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# modokwang <modokwang@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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"
 "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 "清除映射失败。"
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
@@ -59,7 +60,7 @@ msgstr "无法添加服务器配置"
 
 #: js/settings.js:111
 msgid "mappings cleared"
-msgstr ""
+msgstr "清除映射"
 
 #: js/settings.js:112
 msgid "Success"
@@ -342,7 +343,7 @@ msgstr "将用户名称留空(默认)。否则指定一个LDAP/AD属性"
 
 #: templates/settings.php:101
 msgid "Internal Username"
-msgstr ""
+msgstr "内部用户名"
 
 #: templates/settings.php:102
 msgid ""
@@ -358,15 +359,15 @@ msgid ""
 "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 ""
+msgstr "默认情况下内部用户名具有唯一识别属性来确保用户名的唯一性和属性不用转换。内部用户名有严格的字符限制，只允许使用 [ a-zA-Z0-9_.@- ]。其他字符会被ASCII码取代或者被活力。当冲突时会增加或者减少一个数字。内部用户名被用于内部识别用户，同时也作为ownCloud中用户根文件夹的默认名。也作为远程URLs的一部分，比如为了所有的*DAV服务。在这种设置下，默认行为可以被超越。实现一个类似的行为，owncloud 5输入用户的显示名称属性在以下领域之前。让它空着的默认行为。更改只对新映射的影响（增加）的LDAP用户。"
 
 #: templates/settings.php:103
 msgid "Internal Username Attribute:"
-msgstr ""
+msgstr "内部用户名属性："
 
 #: templates/settings.php:104
 msgid "Override UUID detection"
-msgstr ""
+msgstr "超越UUID检测"
 
 #: templates/settings.php:105
 msgid ""
@@ -377,15 +378,15 @@ msgid ""
 "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 ""
+msgstr "默认ownCloud自动检测UUID属性。UUID属性用来无误的识别LDAP用户和组。同时内部用户名也基于UUID创建，如果没有上述的指定。也可以超越设置直接指定一种属性。但一定要确保指定的属性取得的用户和组是唯一的。默认行为空。变更基于新映射(增加)LDAP用户和组才会生效。"
 
 #: templates/settings.php:106
 msgid "UUID Attribute:"
-msgstr ""
+msgstr "UUID属性："
 
 #: templates/settings.php:107
 msgid "Username-LDAP User Mapping"
-msgstr ""
+msgstr "用户名-LDAP用户映射"
 
 #: templates/settings.php:108
 msgid ""
@@ -400,15 +401,15 @@ msgid ""
 "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 ""
+msgstr "ownCloud使用用户名存储和分配数据(元)。为了准确地识别和确认用户，每个用户都有一个内部用户名。需要从ownCloud用户名映射到LDAP用户。创建的用户名映射到LDAP用户的UUID。此外，DN是缓存以及减少LDAP交互，但它不用于识别。如果DN变化，ownCloud也会变化。内部ownCloud名在ownCloud的各处使用。清除映射将一片混乱。清除映射不是常用的配置，它影响到所有LDAP配置！千万不要在正式环境中清除映射。只有在测试或试验阶段可以清除映射。"
 
 #: templates/settings.php:109
 msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "清除用户-LDAP用户映射"
 
 #: templates/settings.php:109
 msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "清除组用户-LDAP级映射"
 
 #: templates/settings.php:111
 msgid "Test Configuration"
diff --git a/l10n/zh_CN/user_webdavauth.po b/l10n/zh_CN/user_webdavauth.po
index 82c49c2fbc26aad0a61e865da8e4e44e72f9cf2a..084e95b9302bf0ce42783c67a19255b42e6236d3 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 db2899c5acc1f192d360e92840a48db0854eedc9..c3282eca9579927a777bf5f095edbf72c38c662a 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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
@@ -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 "Yes"
 
-#: js/oc-dialogs.js:168
+#: js/oc-dialogs.js:172
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:181
+#: js/oc-dialogs.js:185
 msgid "Ok"
 msgstr "OK"
 
@@ -392,7 +373,7 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "更新成功, 正"
 
-#: lostpassword/controller.php:48
+#: lostpassword/controller.php:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
 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 b90c1a88c2ce8d2138b379c76bd70f2dd98b2a19..8b9823ccea1233fd20c2ee6d0fe23cce2f044dab 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -183,35 +183,35 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "錯誤"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "名稱"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{}文件夾"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr ""
 
diff --git a/l10n/zh_HK/files_encryption.po b/l10n/zh_HK/files_encryption.po
index 8956d5a1845185c1d19b6f9f57f675074c699769..f96c6a46879b89b104450f58da642fd086c494f0 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -43,61 +43,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr ""
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 a492dedfe1ab36986bb35b50162d57f64d75194c..a180f2b4568e3cccf415d5be11a8c1a5f41c72a8 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 cc4d9910a5182cfaccb4ba894b1c9e3652b539f0..d8f8f0bcc2b784e397f784b1ad4b6445c1a8130d 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 ac820407ffcdd6324f40e0eb18c0cb91d9de8623..9a5d074e4d7b41247065e6c882e15c859c3826a3 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 f093e56bf3565635b7765217ae713375ae947af9..5e3b13ad0189de63e327b49489517ae1032bd9c8 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 852c2569c1b3d3f94dce11cb6a1c93d13726b0ab..787dfe4975dfd6b5ac3c45bcd7b8d774738b8196 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr ""
 
@@ -463,34 +463,44 @@ 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:84
+msgid "Username"
+msgstr "用戶名稱"
+
+#: 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 f2ee3cc4e14592267f0208798e44026a3a96fa85..055359846a76fd6e1bdc33d889f775f3eb16b752 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 944ff2142aa58bae225ccdf5d3e2f030c39534d3..7990321325c5735ba1cbec8813d94d6cffe3a331 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 46768cd046bc5f3b9511c2b20cbc09b7ae0191be..c2abc1a16f7e1777722bdd397048a5c0a2528baf 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# chenanyeh <chnjsn1221@gmail.com>, 2013
 # pellaeon <nfsmwlin@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+0000\n"
+"Last-Translator: chenanyeh <chnjsn1221@gmail.com>\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 +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."
@@ -217,23 +199,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 +375,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:60
 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 are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:24
+msgid "Yes, I really want to reset my password now"
+msgstr "對，我現在想要重設我的密碼。"
+
+#: lostpassword/templates/lostpassword.php:27
 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 ""
+
+#: 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 ""
+
 #: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "上一頁"
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 7a374f45b2462575fe218559426445035522546e..4896947e1ddfb1af39a5c28ec893733d171de108 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:14+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"
@@ -184,35 +184,35 @@ msgstr "URL 不能為空白。"
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "無效的資料夾名稱，'Shared' 的使用被 ownCloud 保留"
 
-#: js/files.js:520 js/files.js:536 js/files.js:826 js/files.js:864
+#: js/files.js:520 js/files.js:536 js/files.js:840 js/files.js:878
 msgid "Error"
 msgstr "錯誤"
 
-#: js/files.js:877 templates/index.php:69
+#: js/files.js:891 templates/index.php:69
 msgid "Name"
 msgstr "名稱"
 
-#: js/files.js:878 templates/index.php:80
+#: js/files.js:892 templates/index.php:80
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:879 templates/index.php:82
+#: js/files.js:893 templates/index.php:82
 msgid "Modified"
 msgstr "修改"
 
-#: js/files.js:898
+#: js/files.js:912
 msgid "1 folder"
 msgstr "1 個資料夾"
 
-#: js/files.js:900
+#: js/files.js:914
 msgid "{count} folders"
 msgstr "{count} 個資料夾"
 
-#: js/files.js:908
+#: js/files.js:922
 msgid "1 file"
 msgstr "1 個檔案"
 
-#: js/files.js:910
+#: js/files.js:924
 msgid "{count} files"
 msgstr "{count} 個檔案"
 
diff --git a/l10n/zh_TW/files_encryption.po b/l10n/zh_TW/files_encryption.po
index ed4c130a772d395140a1d8e860a69fa558989d20..fdaaecf72f14f0bf4fccbefc960092867379e643 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-22 02:06+0200\n"
+"PO-Revision-Date: 2013-06-22 00:07+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -44,61 +44,128 @@ 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 ""
+
+#: hooks/hooks.php:44
+msgid "PHP module OpenSSL is not installed."
+msgstr ""
+
+#: hooks/hooks.php:45
+msgid ""
+"Please ask your server administrator to install the module. For now the "
+"encryption app was disabled."
+msgstr ""
+
 #: js/settings-admin.js:11
 msgid "Saving..."
 msgstr "儲存中..."
 
+#: 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):"
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:13
-msgid "Recovery account password"
+#: templates/settings-admin.php:14
+msgid "Recovery key 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
-msgid "Change encryption passwords recovery key:"
-msgstr "變更加密密碼還原金鑰："
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr ""
 
-#: templates/settings-admin.php:39
-msgid "Old Recovery account password"
+#: templates/settings-admin.php:41
+msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:46
-msgid "New Recovery account password"
+#: templates/settings-admin.php:48
+msgid "New Recovery key 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 573c495c8bf2fb0bb1f9f67ed795dde5d2be6f0a..1aca2dcbc34696cb2a3b3b562181b7af973e730f 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 9c7942279e425ab5e8c8598f6be20a438d0205a6..6c75be8ce991db07a28f13027271a4854fcd6a71 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 32a463d2ebab3d455f6e16e534f7368c4e72eb05..86ccf90cda6a2ed5547688a6aca6a5d7c6449dc4 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 cc6dc70748eb125dcc918cc21949516611adc0fc..246177c3609a4d4a8543df194468101ee61278ef 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-26 00:02+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 61325b65b5c9c6dd3fd267d7f674cba694acebbd..f1377e028103e8eb992c3aa88a66c7e2a973ae66 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:17+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-06-26 02:00+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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
 msgid "Login Name"
 msgstr "登入名稱"
 
@@ -464,34 +464,44 @@ 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:84
+msgid "Username"
+msgstr "使用者名稱"
+
+#: 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 0a1118b448bfee21c12adb43ad600dc50bc2194e..9932a5abb0070e7b9c631893bed821ef3de20edc 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-03 02:27+0200\n"
-"PO-Revision-Date: 2013-06-02 23:18+0000\n"
+"POT-Creation-Date: 2013-06-26 01:59+0200\n"
+"PO-Revision-Date: 2013-06-25 23:15+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 bfb582efc97056ed32b3a564c128770a7d02211f..5e8abbbb84bed55f110018468229c6360a59c366 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 c6f6e92e60e255d67ece010cf26e432788f70da2..f974dd9f594d0330f6f48dd6219ab9cd1cf394e4 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/autoloader.php b/lib/autoloader.php
index 9615838a9a2a27d608621ad32cf8eddb6e0ac5e2..21170639092029561eefb9e9aa0212d5202bb09d 100644
--- a/lib/autoloader.php
+++ b/lib/autoloader.php
@@ -96,8 +96,8 @@ class Autoloader {
 		} else {
 			foreach ($this->prefixPaths as $prefix => $dir) {
 				if (0 === strpos($class, $prefix)) {
-					$path = str_replace('\\', DIRECTORY_SEPARATOR, $class) . '.php';
-					$path = str_replace('_', DIRECTORY_SEPARATOR, $path);
+					$path = str_replace('\\', '/', $class) . '.php';
+					$path = str_replace('_', '/', $path);
 					$paths[] = $dir . '/' . $path;
 				}
 			}
diff --git a/lib/base.php b/lib/base.php
index a6e4a47dbf5381dfeba82fa67932d071724c3960..fd4870974fe1b2b8b456a1cd4f868865da5f531a 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();
@@ -291,14 +288,14 @@ class OC {
 		$cookie_path = OC::$WEBROOT ?: '/';
 		ini_set('session.cookie_path', $cookie_path);
 
+		//set the session object to a dummy session so code relying on the session existing still works
+		self::$session = new \OC\Session\Memory('');
+		
 		try{
 			// set the session name to the instance id - which is unique
 			self::$session = new \OC\Session\Internal(OC_Util::getInstanceId());
 			// if session cant be started break with http 500 error
 		}catch (Exception $e){
-			//set the session object to a dummy session so code relying on the session existing still works
-			self::$session = new \OC\Session\Memory('');
-
 			OC_Log::write('core', 'Session could not be initialized',
 				OC_Log::ERROR);
 
diff --git a/lib/config.php b/lib/config.php
index a3663949d1616cf35ff2513553e3e66c4d713e89..e204de0baee0d588b181e88ac9b4c4fc091a3184 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -166,5 +166,6 @@ class Config {
 		}
 		// Prevent others from reading the config
 		@chmod($this->configFilename, 0640);
+		OC_Util::clearOpcodeCache();
 	}
 }
diff --git a/lib/connector/sabre/locks.php b/lib/connector/sabre/locks.php
index e58e584fb4117594c5602b12604e5fde497e8cba..7aca2e437129714038ef0a3ffff6d1ccd0064c70 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,12 @@ 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` = ?';
+		if (OC_Config::getValue( "dbtype") === 'oci') {
+			//FIXME oracle hack: need to explicitly cast CLOB to CHAR for comparison
+			$sql = 'DELETE FROM `*PREFIX*locks` WHERE `userid` = ? AND to_char(`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 329fa4443ad7076aabe5f0364fc605362ff26982..2eda269afc2c8c0c81c4467b43f6e4a35f199cc5 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/connector/sabre/node.php b/lib/connector/sabre/node.php
index 1ffa048d6b23b8725538ee5c80673ae18ea6cb93..0bffa58af78b9efe3a3688c0afb749054b34a1e3 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -189,8 +189,8 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	 */
 	public function getProperties($properties) {
 		if (is_null($this->property_cache)) {
-			$query = OC_DB::prepare( 'SELECT * FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ?' );
-			$result = $query->execute( array( OC_User::getUser(), $this->path ));
+			$sql = 'SELECT * FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ?';
+			$result = OC_DB::executeAudited( $sql, array( OC_User::getUser(), $this->path ) );
 
 			$this->property_cache = array();
 			while( $row = $result->fetchRow()) {
diff --git a/lib/db.php b/lib/db.php
index 618365518331c20798c805352eb92c0e4e1a9801..a6b81aaba69afd943091274ce2fe72390eefe808 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;
 	}
@@ -391,10 +392,60 @@ class OC_DB {
 		return $result;
 	}
 
+	/**
+	 * @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 0000000000000000000000000000000000000000..7dc6fbd0ada1964847843a57ac7e148a37103d4a
--- /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 8933101577d5cab06c2c59425f5e386b24bffad9..923804f48d0121fd2db15d92b2e7ef9ca77631ba 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 cae2e63e4dc18746445e582b707bb7b142175560..3818fdbd84065fb43b7ed2d9f731dddcd3e74674 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 b8e2548639baf4171327009f26eaa8238f839f1e..8eed1f67a5d4eb387832d62c486a98d991e16851 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 29c30b0f36c8cb657f4bd28ea8bba4576ec9dcd5..2e2bdb20b781cc4f80cb71124654bc03b8136c44 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/scanner.php b/lib/files/cache/scanner.php
index 8f9a7921956f6a4c3fbc9eab9d6ef70b8ee64caf..9b94a24f48123e3e6e20eb1c531cb2ab23f6cfd1 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -8,6 +8,8 @@
 
 namespace OC\Files\Cache;
 
+use OC\Files\Filesystem;
+
 class Scanner {
 	/**
 	 * @var \OC\Files\Storage\Storage $storage
@@ -27,6 +29,9 @@ class Scanner {
 	const SCAN_RECURSIVE = true;
 	const SCAN_SHALLOW = false;
 
+	const REUSE_ETAG = 1;
+	const REUSE_SIZE = 2;
+
 	public function __construct(\OC\Files\Storage\Storage $storage) {
 		$this->storage = $storage;
 		$this->storageId = $this->storage->getId();
@@ -59,12 +64,12 @@ class Scanner {
 	 * scan a single file and store it in the cache
 	 *
 	 * @param string $file
-	 * @param bool $checkExisting check existing folder sizes in the cache instead of always using -1 for folder size
+	 * @param int $reuseExisting
 	 * @return array with metadata of the scanned file
 	 */
-	public function scanFile($file, $checkExisting = false) {
-		if ( ! self::isPartialFile($file)
-			and ! \OC\Files\Filesystem::isFileBlacklisted($file)
+	public function scanFile($file, $reuseExisting = 0) {
+		if (!self::isPartialFile($file)
+			and !Filesystem::isFileBlacklisted($file)
 		) {
 			\OC_Hook::emit('\OC\Files\Cache\Scanner', 'scan_file', array('path' => $file, 'storage' => $this->storageId));
 			$data = $this->getData($file);
@@ -79,20 +84,22 @@ class Scanner {
 					}
 				}
 				$newData = $data;
-				if ($cacheData = $this->cache->get($file)) {
-					if ($checkExisting && $data['size'] === -1) {
-						$data['size'] = $cacheData['size'];
-					}
-					if ($data['mtime'] === $cacheData['mtime'] &&
-						$data['size'] === $cacheData['size']) {
-						$data['etag'] = $cacheData['etag'];
+				if ($reuseExisting and $cacheData = $this->cache->get($file)) {
+					// only reuse data if the file hasn't explicitly changed
+					if ($data['mtime'] === $cacheData['mtime']) {
+						if (($reuseExisting & self::REUSE_SIZE) && ($data['size'] === -1)) {
+							$data['size'] = $cacheData['size'];
+						}
+						if ($reuseExisting & self::REUSE_ETAG) {
+							$data['etag'] = $cacheData['etag'];
+						}
 					}
 					// Only update metadata that has changed
 					$newData = array_diff($data, $cacheData);
 				}
-				if (!empty($newData)) {
-					$this->cache->put($file, $newData);
-				}
+			}
+			if (!empty($newData)) {
+				$this->cache->put($file, $newData);
 			}
 			return $data;
 		}
@@ -100,55 +107,79 @@ class Scanner {
 	}
 
 	/**
-	 * scan all the files in a folder and store them in the cache
+	 * scan a folder and all it's children
 	 *
 	 * @param string $path
 	 * @param bool $recursive
-	 * @param bool $onlyChilds
+	 * @param int $reuse
 	 * @return int the size of the scanned folder or -1 if the size is unknown at this stage
 	 */
-	public function scan($path, $recursive = self::SCAN_RECURSIVE, $onlyChilds = false) {
-		\OC_Hook::emit('\OC\Files\Cache\Scanner', 'scan_folder', array('path' => $path, 'storage' => $this->storageId));
-		$childQueue = array();
-		if (!$onlyChilds) {
-			$this->scanFile($path);
+	public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1) {
+		if ($reuse === -1) {
+			$reuse = ($recursive === self::SCAN_SHALLOW) ? self::REUSE_ETAG | self::REUSE_SIZE : 0;
 		}
+		$this->scanFile($path, $reuse);
+		return $this->scanChildren($path, $recursive, $reuse);
+	}
 
+	/**
+	 * scan all the files and folders in a folder
+	 *
+	 * @param string $path
+	 * @param bool $recursive
+	 * @param int $reuse
+	 * @return int the size of the scanned folder or -1 if the size is unknown at this stage
+	 */
+	public function scanChildren($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1) {
+		if ($reuse === -1) {
+			$reuse = ($recursive === self::SCAN_SHALLOW) ? self::REUSE_ETAG | self::REUSE_SIZE : 0;
+		}
+		\OC_Hook::emit('\OC\Files\Cache\Scanner', 'scan_folder', array('path' => $path, 'storage' => $this->storageId));
 		$size = 0;
+		$childQueue = array();
+		$existingChildren = array();
+		if ($this->cache->inCache($path)) {
+			$children = $this->cache->getFolderContents($path);
+			foreach ($children as $child) {
+				$existingChildren[] = $child['name'];
+			}
+		}
+		$newChildren = array();
 		if ($this->storage->is_dir($path) && ($dh = $this->storage->opendir($path))) {
 			\OC_DB::beginTransaction();
 			while ($file = readdir($dh)) {
 				$child = ($path) ? $path . '/' . $file : $file;
-				if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
-					$data = $this->scanFile($child, $recursive === self::SCAN_SHALLOW);
+				if (!Filesystem::isIgnoredDir($file)) {
+					$newChildren[] = $file;
+					$data = $this->scanFile($child, $reuse);
 					if ($data) {
 						if ($data['size'] === -1) {
 							if ($recursive === self::SCAN_RECURSIVE) {
 								$childQueue[] = $child;
-								$data['size'] = 0;
 							} else {
 								$size = -1;
 							}
-						}
-
-						if ($size !== -1) {
+						} else if ($size !== -1) {
 							$size += $data['size'];
 						}
 					}
 				}
 			}
+			$removedChildren = \array_diff($existingChildren, $newChildren);
+			foreach ($removedChildren as $childName) {
+				$child = ($path) ? $path . '/' . $childName : $childName;
+				$this->cache->remove($child);
+			}
 			\OC_DB::commit();
 			foreach ($childQueue as $child) {
-				$childSize = $this->scan($child, self::SCAN_RECURSIVE, true);
+				$childSize = $this->scanChildren($child, self::SCAN_RECURSIVE);
 				if ($childSize === -1) {
 					$size = -1;
 				} else {
 					$size += $childSize;
 				}
 			}
-			if ($size !== -1) {
-				$this->cache->put($path, array('size' => $size));
-			}
+			$this->cache->put($path, array('size' => $size));
 		}
 		return $size;
 	}
diff --git a/lib/files/cache/storage.php b/lib/files/cache/storage.php
index 72de376798cde270c7f4a507ae2244d8506d13cb..8a9e47ca36d62422b4d7db3a5bb959c03d4fef7c 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/updater.php b/lib/files/cache/updater.php
index 417a47f3830d8d9c5575e0630393c0ff1f2e3a1e..87c33a313a482ebb755ef0bbdfc3ac56bfbb37ec 100644
--- a/lib/files/cache/updater.php
+++ b/lib/files/cache/updater.php
@@ -7,6 +7,7 @@
  */
 
 namespace OC\Files\Cache;
+use OCP\Util;
 
 /**
  * listen to filesystem hooks and change the cache accordingly
@@ -102,7 +103,7 @@ class Updater {
 	static public function correctFolder($path, $time) {
 		if ($path !== '' && $path !== '/') {
 			$parent = dirname($path);
-			if ($parent === '.') {
+			if ($parent === '.' || $parent === '\\') {
 				$parent = '';
 			}
 			/**
@@ -116,6 +117,8 @@ class Updater {
 				if ($id !== -1) {
 					$cache->update($id, array('mtime' => $time, 'etag' => $storage->getETag($internalPath)));
 					self::correctFolder($parent, $time);
+				} else {
+					Util::writeLog('core', 'Path not in cache: '.$internalPath, Util::ERROR);
 				}
 			}
 		}
diff --git a/lib/files/cache/upgrade.php b/lib/files/cache/upgrade.php
index ca044ba81dedef005ac0392862e0e85617c9a04e..cfb9a1173113fffd6f278acb780a05e87879001d 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 15f5f0628b5cd7ebee9072c1d234dfc2b9727c80..47abd4e52fefb911c1d7f34b847b4111096feaed 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/files/view.php b/lib/files/view.php
index ecb0f30400a43545a444cc86a402421bb6f619f8..25071709fbe243869e68ccbdf7a6d5cabc835de5 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -300,7 +300,7 @@ class View {
 					list ($count, $result) = \OC_Helper::streamCopy($data, $target);
 					fclose($target);
 					fclose($data);
-					if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path)) {
+					if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path) && $result !== false) {
 						if (!$exists) {
 							\OC_Hook::emit(
 								Filesystem::CLASSNAME,
@@ -386,11 +386,19 @@ class View {
 						$source = $this->fopen($path1 . $postFix1, 'r');
 						$target = $this->fopen($path2 . $postFix2, 'w');
 						list($count, $result) = \OC_Helper::streamCopy($source, $target);
-						list($storage1, $internalPath1) = Filesystem::resolvePath($absolutePath1 . $postFix1);
-						$storage1->unlink($internalPath1);
+
+						// close open handle - especially $source is necessary because unlink below will
+						// throw an exception on windows because the file is locked
+						fclose($source);
+						fclose($target);
+
+						if ($result !== false) {
+							list($storage1, $internalPath1) = Filesystem::resolvePath($absolutePath1 . $postFix1);
+							$storage1->unlink($internalPath1);
+						}
 					}
 				}
-				if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path1)) {
+				if ($this->fakeRoot == Filesystem::getRoot() && !Cache\Scanner::isPartialFile($path1) && $result !== false) {
 					\OC_Hook::emit(
 						Filesystem::CLASSNAME,
 						Filesystem::signal_post_rename,
@@ -484,7 +492,7 @@ class View {
 						list($count, $result) = \OC_Helper::streamCopy($source, $target);
 					}
 				}
-				if ($this->fakeRoot == Filesystem::getRoot()) {
+				if ($this->fakeRoot == Filesystem::getRoot() && $result !== false) {
 					\OC_Hook::emit(
 						Filesystem::CLASSNAME,
 						Filesystem::signal_post_copy,
@@ -648,7 +656,7 @@ class View {
 					$result = $storage->$operation($internalPath);
 				}
 				$result = \OC_FileProxy::runPostProxies($operation, $this->getAbsolutePath($path), $result);
-				if (Filesystem::$loaded and $this->fakeRoot == Filesystem::getRoot()) {
+				if (Filesystem::$loaded and $this->fakeRoot == Filesystem::getRoot() && $result !== false) {
 					if ($operation != 'fopen') { //no post hooks for fopen, the file stream is still open
 						$this->runHooks($hooks, $path, true);
 					}
diff --git a/lib/helper.php b/lib/helper.php
index 225e9fd2a9a439e7903d1e6bbc8ddf0c08206078..a315c640d1a70c006adb9cb8a5bd6035173c675e 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -363,6 +363,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
@@ -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/hintexception.php b/lib/hintexception.php
index c8bff750033ed4cef6ec1bce5ff0cea06b4b7db7..3934ae2a4c238b2e4e36867051b14efd4a102bf0 100644
--- a/lib/hintexception.php
+++ b/lib/hintexception.php
@@ -12,7 +12,7 @@ class HintException 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);
 	}
diff --git a/lib/l10n/bg_BG.php b/lib/l10n/bg_BG.php
index 2de4c0a6e68cb8fd930a0b10abaf8979ca745cf5..8412ac9548f03d80600eb498e45c47bb6ad54cef 100644
--- a/lib/l10n/bg_BG.php
+++ b/lib/l10n/bg_BG.php
@@ -21,16 +21,21 @@
 "%s enter the database username." => "%s въведете потребителско име за базата с данни.",
 "%s enter the database name." => "%s въведете име на базата с данни.",
 "%s you may not use dots in the database name" => "%s, не можете да ползвате точки в името на базата от данни",
+"%s set the database host." => "%s задай хост на базата данни.",
 "PostgreSQL username and/or password not valid" => "Невалидно PostgreSQL потребителско име и/или парола",
 "You need to enter either an existing account or the administrator." => "Необходимо е да влезете в всъществуващ акаунт или като администратора",
+"Oracle connection could not be established" => "Oracle връзка не можа да се осъществи",
 "MySQL username and/or password not valid" => "Невалидно MySQL потребителско име и/или парола",
 "DB Error: \"%s\"" => "Грешка в базата от данни: \"%s\"",
+"Offending command was: \"%s\"" => "Проблемната команда беше: \"%s\"",
 "MySQL user '%s'@'localhost' exists already." => "MySQL потребителят '%s'@'localhost' вече съществува",
 "Drop this user from MySQL" => "Изтриване на потребителя от MySQL",
 "MySQL user '%s'@'%%' already exists" => "MySQL потребителят  '%s'@'%%' вече съществува.",
 "Drop this user from MySQL." => "Изтриване на потребителя от MySQL.",
 "Oracle username and/or password not valid" => "Невалидно Oracle потребителско име и/или парола",
+"Offending command was: \"%s\", name: %s, password: %s" => "Проблемната команда беше: \"%s\", име: %s, парола: %s",
 "MS SQL username and/or password not valid: %s" => "Невалидно MS SQL потребителско име и/или парола: %s",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Вашият web сървър все още не е удачно настроен да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи.",
 "Please double check the <a href='%s'>installation guides</a>." => "Моля направете повторна справка с <a href='%s'>ръководството за инсталиране</a>.",
 "seconds ago" => "преди секунди",
 "1 minute ago" => "преди 1 минута",
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
index 36469507d405bde117e513f5023a40d65ab4c81e..b74b9a7184c4dfed26889912d6d741945fb3f78a 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -24,6 +24,7 @@
 "%s set the database host." => "Zadejte název počítače s databází %s.",
 "PostgreSQL username and/or password not valid" => "Uživatelské jméno, či heslo PostgreSQL není platné",
 "You need to enter either an existing account or the administrator." => "Musíte zadat existující účet, či správce.",
+"Oracle connection could not be established" => "Spojení s Oracle nemohlo být navázáno",
 "MySQL username and/or password not valid" => "Uživatelské jméno, či heslo MySQL není platné",
 "DB Error: \"%s\"" => "Chyba DB: \"%s\"",
 "Offending command was: \"%s\"" => "Podezřelý příkaz byl: \"%s\"",
diff --git a/lib/l10n/da.php b/lib/l10n/da.php
index aead17f510ef357c7d93b0d4f15db8c4685ff7b1..3202ae3a335a809dc8dff44c3c76c772450d401c 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/de.php b/lib/l10n/de.php
index 74715bc66eb7f34f0e206d77f3f46c695cace52c..4869689ba78afddde1751c56a8bb59cc00e6473d 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -24,6 +24,7 @@
 "%s set the database host." => "%s setze den Datenbank-Host",
 "PostgreSQL username and/or password not valid" => "PostgreSQL Benutzername und/oder Passwort ungültig",
 "You need to enter either an existing account or the administrator." => "Du musst entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.",
+"Oracle connection could not be established" => "Es konnte keine Verbindung zur Oracle-Datenbank hergestellt werden",
 "MySQL username and/or password not valid" => "MySQL Benutzername und/oder Passwort ungültig",
 "DB Error: \"%s\"" => "DB Fehler: \"%s\"",
 "Offending command was: \"%s\"" => "Fehlerhafter Befehl war: \"%s\"",
diff --git a/lib/l10n/el.php b/lib/l10n/el.php
index 8637b8da269b30f88f86a702655fa16af21563e4..cd025aec78da4a2ec550ac23804ff71b80f3eac4 100644
--- a/lib/l10n/el.php
+++ b/lib/l10n/el.php
@@ -24,6 +24,7 @@
 "%s set the database host." => "%s ρυθμίση του κεντρικόυ υπολογιστή βάσης δεδομένων. ",
 "PostgreSQL username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της PostgreSQL",
 "You need to enter either an existing account or the administrator." => "Χρειάζεται να εισάγετε είτε έναν υπάρχον λογαριασμό ή του διαχειριστή.",
+"Oracle connection could not be established" => "Αδυναμία σύνδεσης Oracle",
 "MySQL username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της MySQL",
 "DB Error: \"%s\"" => "Σφάλμα Βάσης Δεδομένων: \"%s\"",
 "Offending command was: \"%s\"" => "Η εντολη παραβατικοτητας ηταν: \"%s\"",
diff --git a/lib/l10n/eo.php b/lib/l10n/eo.php
index 2782be65da9e7a3030139a7bf79d4f5a0e18edd5..327fe75b9d231bfd80da39f11b3f54dec06c2029 100644
--- a/lib/l10n/eo.php
+++ b/lib/l10n/eo.php
@@ -15,6 +15,24 @@
 "Files" => "Dosieroj",
 "Text" => "Teksto",
 "Images" => "Bildoj",
+"Set an admin username." => "Starigi administran uzantonomon.",
+"Set an admin password." => "Starigi administran pasvorton.",
+"%s enter the database username." => "%s enigu la uzantonomon de la datumbazo.",
+"%s enter the database name." => "%s enigu la nomon de la datumbazo.",
+"%s you may not use dots in the database name" => "%s vi ne povas uzi punktojn en la nomo de la datumbazo",
+"%s set the database host." => "%s enigu la gastigon de la datumbazo.",
+"PostgreSQL username and/or password not valid" => "La uzantonomo de PostgreSQL aÅ­ la pasvorto ne validas",
+"Oracle connection could not be established" => "Konekto al Oracle ne povas stariĝi",
+"MySQL username and/or password not valid" => "La uzantonomo de MySQL aÅ­ la pasvorto ne validas",
+"DB Error: \"%s\"" => "Datumbaza eraro: “%s”",
+"MySQL user '%s'@'localhost' exists already." => "La uzanto de MySQL “%s”@“localhost” jam ekzistas.",
+"Drop this user from MySQL" => "Forigi ĉi tiun uzanton el MySQL",
+"MySQL user '%s'@'%%' already exists" => "La uzanto de MySQL “%s”@“%%” jam ekzistas",
+"Drop this user from MySQL." => "Forigi ĉi tiun uzanton el MySQL.",
+"Oracle username and/or password not valid" => "La uzantonomo de Oracle aÅ­ la pasvorto ne validas",
+"MS SQL username and/or password not valid: %s" => "La uzantonomo de MS SQL aÅ­ la pasvorto ne validas: %s",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita.",
+"Please double check the <a href='%s'>installation guides</a>." => "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>.",
 "seconds ago" => "sekundoj antaÅ­e",
 "1 minute ago" => "antaÅ­ 1 minuto",
 "%d minutes ago" => "antaÅ­ %d minutoj",
diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php
index 1df1b16de658907cba26c001d8df2ea88b54c4cc..b4b2a33cd011438ba9d6ab0233f20cae6479b186 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/l10n/he.php b/lib/l10n/he.php
index dcd0545adba77a9c5c1d9da3315475e97d4dbcc5..0069d77eee414ddde8cec366df952486029c5860 100644
--- a/lib/l10n/he.php
+++ b/lib/l10n/he.php
@@ -15,6 +15,8 @@
 "Files" => "קבצים",
 "Text" => "טקסט",
 "Images" => "תמונות",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "שרת האינטרנט שלך אינו מוגדר לצורכי סנכרון קבצים עדיין כיוון שמנשק ה־WebDAV כנראה אינו תקין.",
+"Please double check the <a href='%s'>installation guides</a>." => "נא לעיין שוב ב<a href='%s'>מדריכי ההתקנה</a>.",
 "seconds ago" => "שניות",
 "1 minute ago" => "לפני דקה אחת",
 "%d minutes ago" => "לפני %d דקות",
diff --git a/lib/l10n/ko.php b/lib/l10n/ko.php
index bf2a68369f162d265eaf4acb31e63c808cf0342e..bfb99544a3b8c366447959c7582e2a66739b8b74 100644
--- a/lib/l10n/ko.php
+++ b/lib/l10n/ko.php
@@ -16,6 +16,8 @@
 "Files" => "파일",
 "Text" => "텍스트",
 "Images" => "그림",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAV 인터페이스가 제대로 작동하지 않습니다. 웹 서버에서 파일 동기화를 사용할 수 있도록 설정이 제대로 되지 않은 것 같습니다.",
+"Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오.",
 "seconds ago" => "ì´ˆ ì „",
 "1 minute ago" => "1분 전",
 "%d minutes ago" => "%d분 전",
diff --git a/lib/l10n/lt_LT.php b/lib/l10n/lt_LT.php
index cebaa6937d8f482f1a9d1f68bd572d6ab5ae43a8..b8268ed4376f0d8f2dbda01238fc5237651f05b0 100644
--- a/lib/l10n/lt_LT.php
+++ b/lib/l10n/lt_LT.php
@@ -14,13 +14,17 @@
 "Token expired. Please reload page." => "Sesija baigėsi. Prašome perkrauti puslapį.",
 "Files" => "Failai",
 "Text" => "Žinučių",
+"Images" => "PaveikslÄ—liai",
 "seconds ago" => "prieš sekundę",
 "1 minute ago" => "Prieš 1 minutę",
 "%d minutes ago" => "prieš %d minučių",
+"1 hour ago" => "prieš 1 valandą",
+"%d hours ago" => "prieš %d valandų",
 "today" => "Å¡iandien",
 "yesterday" => "vakar",
 "%d days ago" => "prieš %d dienų",
 "last month" => "praeitą mėnesį",
+"%d months ago" => "prieš %d mėnesių",
 "last year" => "praeitais metais",
 "years ago" => "prieš metus"
 );
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index e077b688c09333fb26761bc662fb1572671e97ef..e3e3aee5a922a21b2530ede3768b268f71d3781c 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -24,6 +24,7 @@
 "%s set the database host." => "%s задайте хост базы данных.",
 "PostgreSQL username and/or password not valid" => "Неверное имя пользователя и/или пароль PostgreSQL",
 "You need to enter either an existing account or the administrator." => "Вы должны войти или в существующий аккаунт или под администратором.",
+"Oracle connection could not be established" => "соединение с Oracle не может быть установлено",
 "MySQL username and/or password not valid" => "Неверное имя пользователя и/или пароль MySQL",
 "DB Error: \"%s\"" => "Ошибка БД: \"%s\"",
 "Offending command was: \"%s\"" => "Вызываемая команда была: \"%s\"",
diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php
index 3dcb26d5d8d0499b994b1a13d0bd6214220a838d..f2b7c89205804d6da79b3bef3019d5216d29e588 100644
--- a/lib/l10n/sv.php
+++ b/lib/l10n/sv.php
@@ -16,6 +16,25 @@
 "Files" => "Filer",
 "Text" => "Text",
 "Images" => "Bilder",
+"Set an admin username." => "Ange ett användarnamn för administratören.",
+"Set an admin password." => "Ange ett administratörslösenord.",
+"%s enter the database username." => "%s ange databasanvändare.",
+"%s enter the database name." => "%s ange databasnamn",
+"%s you may not use dots in the database name" => "%s du får inte använda punkter i databasnamnet",
+"%s set the database host." => "%s ange databasserver/host.",
+"PostgreSQL username and/or password not valid" => "PostgreSQL-användarnamnet och/eller lösenordet är felaktigt",
+"You need to enter either an existing account or the administrator." => "Du måste antingen ange ett befintligt konto eller administratör.",
+"Oracle connection could not be established" => "Oracle-anslutning kunde inte etableras",
+"MySQL username and/or password not valid" => "MySQL-användarnamnet och/eller lösenordet är felaktigt",
+"DB Error: \"%s\"" => "DB error: \"%s\"",
+"Offending command was: \"%s\"" => "Det felaktiga kommandot var: \"%s\"",
+"MySQL user '%s'@'localhost' exists already." => "MySQL-användaren '%s'@'localhost' existerar redan.",
+"Drop this user from MySQL" => "Radera denna användare från MySQL",
+"MySQL user '%s'@'%%' already exists" => "MySQl-användare '%s'@'%%' existerar redan",
+"Drop this user from MySQL." => "Radera denna användare från MySQL.",
+"Oracle username and/or password not valid" => "Oracle-användarnamnet och/eller lösenordet är felaktigt",
+"Offending command was: \"%s\", name: %s, password: %s" => "Det felande kommandot var: \"%s\", name: %s, password: %s",
+"MS SQL username and/or password not valid: %s" => "MS SQL-användaren och/eller lösenordet var inte giltigt: %s",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera.",
 "Please double check the <a href='%s'>installation guides</a>." => "Var god kontrollera <a href='%s'>installationsguiden</a>.",
 "seconds ago" => "sekunder sedan",
diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php
index 7996447b95d39147df55eb53ec36ca25ee659f02..2662d61649de8fa195934cafeb085dce2722f17a 100644
--- a/lib/l10n/tr.php
+++ b/lib/l10n/tr.php
@@ -24,6 +24,7 @@
 "%s set the database host." => "%s veritabanı sunucu adını tanımla",
 "PostgreSQL username and/or password not valid" => "PostgreSQL adi kullanici ve/veya parola yasal degildir. ",
 "You need to enter either an existing account or the administrator." => "Bir konto veya kullanici birlemek ihtiyacin. ",
+"Oracle connection could not be established" => "Oracle bağlantısı kurulamadı",
 "MySQL username and/or password not valid" => "MySQL kullanıcı adı ve/veya parolası geçerli değil",
 "DB Error: \"%s\"" => "DB Hata: ''%s''",
 "Offending command was: \"%s\"" => "Komut rahasiz ''%s''. ",
diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php
index 61e405d80583bda00531399302a1aee4edfe4c83..edb0f81ee9d6ad5bb35434e121a477f5464067bc 100644
--- a/lib/l10n/zh_CN.php
+++ b/lib/l10n/zh_CN.php
@@ -24,6 +24,7 @@
 "%s set the database host." => "%s 设置数据库所在主机。",
 "PostgreSQL username and/or password not valid" => "PostgreSQL 数据库用户名和/或密码无效",
 "You need to enter either an existing account or the administrator." => "你需要输入一个数据库中已有的账户或管理员账户。",
+"Oracle connection could not be established" => "不能建立甲骨文连接",
 "MySQL username and/or password not valid" => "MySQL 数据库用户名和/或密码无效",
 "DB Error: \"%s\"" => "数据库错误：\"%s\"",
 "Offending command was: \"%s\"" => "冲突命令为：\"%s\"",
diff --git a/lib/public/share.php b/lib/public/share.php
index 81f5515bb4ba1d50522d9a00a364c71aa69c3e7d..122ab3fa03019717d15af5a199de0c493d2eaf48 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 49d79fda7099dad395847c3cd68de94a67d9518e..674176d078b2ffa34b78808560b77c13990b7a86 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 fd22141f1b9577b439ed7d262330b22aa36ebde1..4a15d14a34d621566a287be232d3b79156044a4f 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -92,12 +92,6 @@ class OC_Setup {
 						'hint' => $e->getHint()
 					);
 					return($error);
-				} catch (Exception $e) {
-					$error[] = array(
-						'error' => $e->getMessage(),
-						'hint' => ''
-					);
-					return($error);
 				}
 			}
 			elseif($dbtype == 'pgsql') {
@@ -113,7 +107,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.')
@@ -125,18 +119,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')
@@ -163,7 +160,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.'
@@ -312,7 +309,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
@@ -357,7 +360,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);
@@ -432,7 +435,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);
@@ -447,9 +450,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
 
@@ -516,7 +519,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);
@@ -627,7 +630,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 9467dedb62aac43c34f31480cb6efac051771232..ae9ea187445912434622f0f0a8481ac9a2d98d44 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 503ac3f749327eea5328a34551e8940a5b9fc62e..830f13bb8df6900304eb60d042d410ac844b54ef 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -190,7 +190,7 @@ class OC_User {
 					// use Reflection to create a new instance, using the $args
 					$backend = $reflectionObj->newInstanceArgs($arguments);
 					self::useBackend($backend);
-					$_setupedBackends[] = $i;
+					self::$_setupedBackends[] = $i;
 				} else {
 					OC_Log::write('core', 'User backend ' . $class . ' already initialized.', OC_Log::DEBUG);
 				}
@@ -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/database.php b/lib/user/database.php
index d70b620f2abf055d9fd102fd36930bdce474f16f..9f00a022d9fa59ced26ff23d213b935a97545423 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -85,7 +85,7 @@ class OC_User_Database extends OC_User_Backend {
 	 */
 	public function deleteUser( $uid ) {
 		// Delete user-group-relation
-		$query = OC_DB::prepare( 'DELETE FROM `*PREFIX*users` WHERE uid = ?' );
+		$query = OC_DB::prepare( 'DELETE FROM `*PREFIX*users` WHERE `uid` = ?' );
 		$query->execute( array( $uid ));
 		return true;
 	}
diff --git a/lib/user/user.php b/lib/user/user.php
index f9466b71499ff638e8d10e9293839b8d8bc77983..55d7848a979c80e8b229cb41949e22f979709ad3 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 95af22ed0eedfa9481ae2f63b7caa997ba32a307..4bc02daf36e9103aace5bd28fbac8aed5f5c3c64 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -819,9 +819,9 @@ class OC_Util {
 	 * @return string the theme
 	 */
 	public static function getTheme() {
-		$theme = OC_Config::getValue("theme");
+		$theme = OC_Config::getValue("theme", '');
 
-		if(is_null($theme)) {
+		if($theme === '') {
 			
 			if(is_dir(OC::$SERVERROOT . '/themes/default')) {
 				$theme = 'default';
@@ -832,6 +832,26 @@ class OC_Util {
 		return $theme;
 	}
 
+	/**
+	 * 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
diff --git a/lib/vcategories.php b/lib/vcategories.php
index 91c72d5dfaecda0cf31c007f8a411b45b8bf3ae7..7bac6e7d4e34acc805e2ed2a32468ca0851fab22 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -554,7 +554,7 @@ class OC_VCategories {
 		}
 		try {
 			$stmt = OCP\DB::prepare('DELETE FROM `' . self::CATEGORY_TABLE . '` '
-				. 'WHERE `uid` = ? AND');
+				. 'WHERE `uid` = ?');
 			$result = $stmt->execute(array($arguments['uid']));
 			if (OC_DB::isError($result)) {
 				OC_Log::write('core', __METHOD__. 'DB error: ' . OC_DB::getErrorMessage($result), OC_Log::ERROR);
diff --git a/public.php b/public.php
index 3d7fd378af402e0f739bd86eabf8a656ec43eec9..0154b59cce30e7af1600d534d2f3b9d704942337 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 7738de04f6000ee7c25d93dab2152efc4a72d83e..ec0f2ecef7254b097fd6051ddb071eec93da154b 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 cb66c57c743bcb9fc4fcb9bfb5bbff50a0b9753d..d409904ebc72ee1703b2b1280cf24942aec8d196 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 bf3a34f1472ffae747cc165f24af756af3a0a2e9..8732c6518a8194bc6d6f792494b54bab14f71d1e 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 950e892901208a799fe42702d4897212cca4aa3b..3c406109a1f8a63f2070142e0d75c22e2750321c 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/js/users.js b/settings/js/users.js
index f3fab34b090cc6cb9a97f060a925be5df1a22daa..7ed6c50d588696713cdabfe8aaeb35c429a26645 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -88,7 +88,7 @@ var UserList = {
 		tr.attr('data-uid', username);
 		tr.attr('data-displayName', displayname);
 		tr.find('td.name').text(username);
-		tr.find('td.displayName').text(displayname);
+		tr.find('td.displayName > span').text(displayname);
 		var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>').attr('data-username', username).attr('data-user-groups', groups);
 		tr.find('td.groups').empty();
 		if (tr.find('td.subadmins').length > 0) {
diff --git a/settings/l10n/af_ZA.php b/settings/l10n/af_ZA.php
index f32b79b80f45125035af7a1e6ed64e11467dd9e2..f89e0062928bd27984752c4f67b0f2fb803554af 100644
--- a/settings/l10n/af_ZA.php
+++ b/settings/l10n/af_ZA.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Wagwoord",
-"New password" => "Nuwe wagwoord"
+"New password" => "Nuwe wagwoord",
+"Username" => "Gebruikersnaam"
 );
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index a69bc9bed5aade5b376e800772bfa00b3ac034dd..73eb41277498ae50dbbe2d2de4697c4b1b79bf7b 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" => "لم يتم تعديل كلمة السر بنجاح",
@@ -103,6 +103,7 @@
 "Default Storage" => "وحدة التخزين الافتراضية",
 "Unlimited" => "غير محدود",
 "Other" => "شيء آخر",
+"Username" => "إسم المستخدم",
 "Storage" => "وحدة التخزين",
 "change display name" => "تغيير اسم الحساب",
 "set new password" => "اعداد كلمة مرور جديدة",
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index e5cc8bde398efcf2a251a9ab7ab15cb8a45b45a0..31e5132edd28c800e27a543b5ab9b406ff75961f 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -22,6 +22,7 @@
 "Delete" => "Изтриване",
 "add group" => "нова група",
 "__language_name__" => "__language_name__",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Вашият web сървър все още не е удачно настроен да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи.",
 "Please double check the <a href='%s'>installation guides</a>." => "Моля направете повторна справка с <a href='%s'>ръководството за инсталиране</a>.",
 "Cron" => "Крон",
 "Sharing" => "Споделяне",
@@ -56,6 +57,7 @@
 "Default Storage" => "Хранилище по подразбиране",
 "Unlimited" => "Неограничено",
 "Other" => "Други",
+"Username" => "Потребител",
 "Storage" => "Хранилище",
 "Default" => "По подразбиране"
 );
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index a1e724aa96738a9d6cd01334f72a1dcd9da14872..d5cecb60aa44bfcd371e6672c3bbcbf4dfab07e2 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" => "আপনার কূটশব্দটি পরিবর্তন করতে সক্ষম নয়",
@@ -58,6 +58,7 @@
 "Default Storage" => "পূর্বনির্ধারিত সংরক্ষণাগার",
 "Unlimited" => "অসীম",
 "Other" => "অন্যান্য",
+"Username" => "ব্যবহারকারী",
 "Storage" => "সংরক্ষণাগার",
 "Default" => "পূর্বনির্ধারিত"
 );
diff --git a/settings/l10n/bs.php b/settings/l10n/bs.php
new file mode 100644
index 0000000000000000000000000000000000000000..774f081673dc49395c18685a4bed2e29ed93090b
--- /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 769c25d7bffedb2a217a42a4a5b94531f6213d25..5125fa6ee6ee66193d34dd9eebd6ce5ffbb78217 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,9 +102,11 @@
 "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",
+"Username" => "Nom d'usuari",
 "Storage" => "Emmagatzemament",
 "change display name" => "canvia el nom a mostrar",
 "set new password" => "estableix nova contrasenya",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 6fec132701b149639e29d0ec316b52eaf2379d97..24dd19646919a7d3b6c7019137196ac651709c4b 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",
@@ -101,9 +101,12 @@
 "Use this address to connect to your ownCloud in your file manager" => "Použijte tuto adresu pro připojení k vašemu ownCloud skrze správce souborů",
 "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ý",
+"Username" => "Uživatelské jméno",
 "Storage" => "Úložiště",
 "change display name" => "změnit zobrazované jméno",
 "set new password" => "nastavit nové heslo",
diff --git a/settings/l10n/cy_GB.php b/settings/l10n/cy_GB.php
index 7ffcbdb45b5e7f0c776cb47a890e5c082ee6412b..98a46f5aca9bc20cd2bd64fa66902d4ba5017b43 100644
--- a/settings/l10n/cy_GB.php
+++ b/settings/l10n/cy_GB.php
@@ -12,5 +12,6 @@
 "Password" => "Cyfrinair",
 "New password" => "Cyfrinair newydd",
 "Email" => "E-bost",
-"Other" => "Arall"
+"Other" => "Arall",
+"Username" => "Enw defnyddiwr"
 );
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index a01a90337daf907b134551168a31fc167484e2b6..d20ce6b1401562079b9325fd2fb7394008549615 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,9 +101,12 @@
 "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",
+"Username" => "Brugernavn",
 "Storage" => "Opbevaring",
 "change display name" => "skift skærmnavn",
 "set new password" => "skift kodeord",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 2cf828e73426e95b52b1ebfdf61f514adb6c1970..c8fdc253e9c4b77098eadc78ff6a26634124a6f2 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",
@@ -101,9 +101,12 @@
 "Use this address to connect to your ownCloud in your file manager" => "Verwende diese Adresse, um Deinen Dateimanager mit Deiner ownCloud zu verbinden",
 "Login Name" => "Loginname",
 "Create" => "Anlegen",
+"Admin Recovery Password" => "Admin-Wiederherstellungspasswort",
+"Enter the recovery password in order to recover the users files during password change" => "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
 "Default Storage" => "Standard-Speicher",
 "Unlimited" => "Unbegrenzt",
 "Other" => "Andere",
+"Username" => "Benutzername",
 "Storage" => "Speicher",
 "change display name" => "Anzeigenamen ändern",
 "set new password" => "Neues Passwort setzen",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index f7f532397497feb80e9086aefca41bdafd326e76..700eda6c586003e9fc636d370399db5c78e54164 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",
@@ -102,9 +102,11 @@
 "Login Name" => "Loginname",
 "Create" => "Erstellen",
 "Admin Recovery Password" => "Admin-Paswort-Wiederherstellung",
+"Enter the recovery password in order to recover the users files during password change" => "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
 "Default Storage" => "Standard-Speicher",
 "Unlimited" => "Unbegrenzt",
 "Other" => "Andere",
+"Username" => "Benutzername",
 "Storage" => "Speicher",
 "change display name" => "Anzeigenamen ändern",
 "set new password" => "Neues Passwort setzen",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 3558ae729888146d5068c5041af0159be8a35c41..eee768db5cfa042a313d7dc71cdbd787ad7b5735 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,9 +101,12 @@
 "Use this address to connect to your ownCloud in your file manager" => "Χρήση αυτής της διεύθυνσης για σύνδεση στο ownCloud με τον διαχειριστή αρχείων σας",
 "Login Name" => "Όνομα Σύνδεσης",
 "Create" => "Δημιουργία",
+"Admin Recovery Password" => "Κωδικός Επαναφοράς Διαχειριστή ",
+"Enter the recovery password in order to recover the users files during password change" => "Εισάγετε το συνθηματικό ανάκτησης ώστε να ανακτήσετε τα αρχεία χρηστών κατά την αλλαγή συνθηματικού",
 "Default Storage" => "Προκαθορισμένη Αποθήκευση ",
 "Unlimited" => "Απεριόριστο",
 "Other" => "Άλλο",
+"Username" => "Όνομα χρήστη",
 "Storage" => "Αποθήκευση",
 "change display name" => "αλλαγή ονόματος εμφάνισης",
 "set new password" => "επιλογή νέου κωδικού",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 9fd1d5b320600b282116c4e53963809073124299..83e03f2f5df084c4dc5beb2ad15a36875c4aee0a 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -24,6 +24,8 @@
 "Delete" => "Forigi",
 "__language_name__" => "Esperanto",
 "Security Warning" => "Sekureca averto",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita.",
+"Please double check the <a href='%s'>installation guides</a>." => "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>.",
 "Cron" => "Cron",
 "Sharing" => "Kunhavigo",
 "Enable Share API" => "Kapabligi API-on por Kunhavigo",
@@ -52,6 +54,7 @@
 "Forum" => "Forumo",
 "Bugtracker" => "Cimoraportejo",
 "Commercial Support" => "Komerca subteno",
+"Get the apps to sync your files" => "Ekhavu la aplikaĵojn por sinkronigi viajn dosierojn",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Vi uzas <strong>%s</strong> el la haveblaj <strong>%s</strong>",
 "Password" => "Pasvorto",
 "Your password was changed" => "Via pasvorto ŝanĝiĝis",
@@ -70,6 +73,7 @@
 "Default Storage" => "DefaÅ­lta konservejo",
 "Unlimited" => "Senlima",
 "Other" => "Alia",
+"Username" => "Uzantonomo",
 "Storage" => "Konservejo",
 "Default" => "DefaÅ­lta"
 );
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 137d3c8aff72bb3e51753d9d8b083077b887ef8b..9d6a2bedae946f96253b222a6e4346129ae3e07c 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,9 +102,11 @@
 "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",
+"Username" => "Nombre de usuario",
 "Storage" => "Almacenamiento",
 "change display name" => "Cambiar nombre a mostrar",
 "set new password" => "Configurar nueva contraseña",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index f7eb7dd5c2d3552f8438d77c976529600787357a..f8876ca704656461f40271c9e695e5d20b732ba7 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,9 +101,12 @@
 "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",
+"Username" => "Nombre de usuario",
 "Storage" => "Almacenamiento",
 "change display name" => "Cambiar el nombre que se muestra",
 "set new password" => "Configurar nueva contraseña",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 8a9e237e1208ae5c19f195eaff44846345f0c463..68cee88cf2e88a2e643e5015e77cd5fd664fce04 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,9 +102,11 @@
 "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",
+"Username" => "Kasutajanimi",
 "Storage" => "Maht",
 "change display name" => "muuda näidatavat nime",
 "set new password" => "määra uus parool",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 9982e9af9a03adb9246f14e31fc8f0342089579e..74ddd956f3474a87cf346e864409632545658004 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",
@@ -103,6 +103,7 @@
 "Default Storage" => "Lehenetsitako Biltegiratzea",
 "Unlimited" => "Mugarik gabe",
 "Other" => "Bestelakoa",
+"Username" => "Erabiltzaile izena",
 "Storage" => "Biltegiratzea",
 "change display name" => "aldatu bistaratze izena",
 "set new password" => "ezarri pasahitz berria",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index 1abb70f27a639a6b7a965ff14a69b3ab5928a033..e0090996f2a7c7332d836f179b31155aea49d32b 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" => "ناتوان در تغییر گذرواژه",
@@ -96,6 +96,7 @@
 "Default Storage" => "ذخیره سازی پیش فرض",
 "Unlimited" => "نامحدود",
 "Other" => "دیگر",
+"Username" => "نام کاربری",
 "Storage" => "حافظه",
 "change display name" => "تغییر نام نمایشی",
 "set new password" => "تنظیم کلمه عبور جدید",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index f2d7d333589cadc8e3bfbe04bafc8d5f39325fbf..80ce2a7076489b4e3dd9e1305b152e186c450d2e 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",
@@ -91,6 +91,7 @@
 "Default Storage" => "Oletustallennustila",
 "Unlimited" => "Rajoittamaton",
 "Other" => "Muu",
+"Username" => "Käyttäjätunnus",
 "Storage" => "Tallennustila",
 "change display name" => "vaihda näyttönimi",
 "set new password" => "aseta uusi salasana",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 0067236bad1a74dff94918fc1210fb0feb65c125..fde0806aabb19fa9fa7254a4374f4c921edb836a 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",
@@ -101,9 +101,12 @@
 "Use this address to connect to your ownCloud in your file manager" => "Utiliser cette adresse pour vous connecter à ownCloud dans votre gestionnaire de fichiers",
 "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",
+"Username" => "Nom d'utilisateur",
 "Storage" => "Support de stockage",
 "change display name" => "Changer le nom affiché",
 "set new password" => "Changer le mot de passe",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 05f3dc07c4a64db23ac8a098f4a9bedb3ab24a5a..0d12e272f4a139ac1aeb0ec021a87f5e0fe157c5 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,17 +94,19 @@
 "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",
+"Username" => "Nome de usuario",
 "Storage" => "Almacenamento",
 "change display name" => "cambiar o nome visíbel",
 "set new password" => "estabelecer un novo contrasinal",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index 5aeba49dcf7845a621da12fdf99a5cd5eff201d7..212bf1ed6736fe62f3fe5227cef8a5e520ea54ab 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "לא ניתן לטעון רשימה מה־App Store",
 "Authentication error" => "שגיאת הזדהות",
+"Your display name has been changed." => "שם התצוגה שלך הוחלף.",
+"Unable to change display name" => "לא ניתן לשנות את שם התצוגה",
 "Group already exists" => "הקבוצה כבר קיימת",
 "Unable to add group" => "לא ניתן להוסיף קבוצה",
 "Could not enable app. " => "לא ניתן להפעיל את היישום",
@@ -13,18 +15,49 @@
 "Admins can't remove themself from the admin group" => "מנהלים לא יכולים להסיר את עצמם מקבוצת המנהלים",
 "Unable to add user to group %s" => "לא ניתן להוסיף משתמש לקבוצה %s",
 "Unable to remove user from group %s" => "לא ניתן להסיר משתמש מהקבוצה %s",
+"Couldn't update app." => "לא ניתן לעדכן את היישום.",
+"Update to {appversion}" => "עדכון לגרסה {appversion}",
 "Disable" => "בטל",
 "Enable" => "הפעלה",
+"Please wait...." => "נא להמתין…",
 "Error" => "שגיאה",
+"Updating...." => "מתבצע עדכון…",
+"Error while updating app" => "אירעה שגיאה בעת עדכון היישום",
+"Updated" => "מעודכן",
 "Saving..." => "שמירה…",
+"deleted" => "נמחק",
 "undo" => "ביטול",
+"Unable to remove user" => "לא ניתן להסיר את המשתמש",
 "Groups" => "קבוצות",
 "Group Admin" => "מנהל הקבוצה",
 "Delete" => "מחיקה",
+"add group" => "הוספת קבוצה",
+"A valid username must be provided" => "יש לספק שם משתמש תקני",
+"Error creating user" => "יצירת המשתמש נכשלה",
+"A valid password must be provided" => "יש לספק ססמה תקנית",
 "__language_name__" => "עברית",
 "Security Warning" => "אזהרת אבטחה",
 "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." => "יתכן שתיקיית הנתונים והקבצים שלך נגישים דרך האינטרנט. קובץ ה־‎.htaccess שמסופק על ידי ownCloud כנראה אינו עובד. אנו ממליצים בחום להגדיר את שרת האינטרנט שלך בדרך שבה תיקיית הנתונים לא תהיה זמינה עוד או להעביר את תיקיית הנתונים מחוץ לספריית העל של שרת האינטרנט.",
+"Setup Warning" => "שגיאת הגדרה",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "שרת האינטרנט שלך אינו מוגדר לצורכי סנכרון קבצים עדיין כיוון שמנשק ה־WebDAV כנראה אינו תקין.",
+"Please double check the <a href='%s'>installation guides</a>." => "נא לעיין שוב ב<a href='%s'>מדריכי ההתקנה</a>.",
+"Module 'fileinfo' missing" => "המודול „fileinfo“ חסר",
+"Internet connection not working" => "החיבור לאינטרנט אינו פעיל",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "יש להפעיל משימה אחת עם כל עמוד שנטען",
+"Sharing" => "שיתוף",
+"Enable Share API" => "הפעלת API השיתוף",
+"Allow apps to use the Share API" => "לאפשר ליישום להשתמש ב־API השיתוף",
+"Allow links" => "לאפשר קישורים",
+"Allow users to share items to the public with links" => "לאפשר למשתמשים לשתף פריטים ",
+"Allow resharing" => "לאפשר שיתוף מחדש",
+"Allow users to share items shared with them again" => "לאפשר למשתמשים לשתף הלאה פריטים ששותפו אתם",
+"Allow users to share with anyone" => "לאפשר למשתמשים לשתף עם כל אחד",
+"Allow users to only share with users in their groups" => "לאפשר למשתמשים לשתף עם משתמשים בקבוצות שלהם בלבד",
+"Security" => "אבטחה",
+"Enforce HTTPS" => "לאלץ HTTPS",
 "Log" => "יומן",
+"Log level" => "רמת הדיווח",
 "More" => "יותר",
 "Less" => "פחות",
 "Version" => "גרסא",
@@ -39,21 +72,34 @@
 "Administrator Documentation" => "תיעוד מנהלים",
 "Online Documentation" => "תיעוד מקוון",
 "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" => "לא ניתן לשנות את הססמה שלך",
 "Current password" => "ססמה נוכחית",
 "New password" => "ססמה חדשה",
 "Change password" => "שינוי ססמה",
+"Display Name" => "שם תצוגה",
 "Email" => "דואר אלקטרוני",
 "Your email address" => "כתובת הדוא״ל שלך",
 "Fill in an email address to enable password recovery" => "נא למלא את כתובת הדוא״ל שלך כדי לאפשר שחזור ססמה",
 "Language" => "פה",
 "Help translate" => "עזרה בתרגום",
+"WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "השתמש בכתובת זאת על מנת להתחבר אל ownCloud דרך סייר קבצים.",
+"Login Name" => "שם כניסה",
 "Create" => "יצירה",
-"Other" => "אחר"
+"Admin Recovery Password" => "ססמת השחזור של המנהל",
+"Default Storage" => "אחסון בררת המחדל",
+"Unlimited" => "ללא הגבלה",
+"Other" => "אחר",
+"Username" => "שם משתמש",
+"Storage" => "אחסון",
+"change display name" => "החלפת שם התצוגה",
+"set new password" => "הגדרת ססמה חדשה",
+"Default" => "בררת מחדל"
 );
diff --git a/settings/l10n/hi.php b/settings/l10n/hi.php
index 034ededf5f982ce7ae7e749caf852c5635f3eb4d..a9b508bcb2891259f826ba2eed8ef845cc43b4bc 100644
--- a/settings/l10n/hi.php
+++ b/settings/l10n/hi.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Password" => "पासवर्ड",
-"New password" => "नया पासवर्ड"
+"New password" => "नया पासवर्ड",
+"Username" => "प्रयोक्ता का नाम"
 );
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 87ebf13f798db10f4ca6b008c73b6deca195facf..4bfbc2d3d50defb11409911fe2c9ddd0dcdff1b5 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -32,5 +32,6 @@
 "Language" => "Jezik",
 "Help translate" => "Pomoć prevesti",
 "Create" => "Izradi",
-"Other" => "ostali"
+"Other" => "ostali",
+"Username" => "Korisničko ime"
 );
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 70cbf3d13652e8a571ef657f2c8d03aaf3011afc..57482afefc18fbb770b76de88140c37b376af0cf 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -37,12 +37,12 @@
 "A valid password must be provided" => "Érvényes jelszót kell megadnia",
 "__language_name__" => "__language_name__",
 "Security Warning" => "Biztonsági figyelmeztetés",
-"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." => "Az adatkönytára és az itt levő fájlok valószínűleg elérhetők az internetről. Az ownCloud által beillesztett .htaccess fájl nem működik. Nagyon fontos, hogy a webszervert úgy konfigurálja, hogy az adatkönyvtár nem legyen közvetlenül kívülről elérhető, vagy az adatkönyvtárt tegye a webszerver dokumentumfáján kívülre.",
+"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." => "Az adatkönytára és az itt levő fájlok valószínűleg elérhetők az internetről. Az ownCloud által beillesztett .htaccess fájl nem működik. Nagyon fontos, hogy a webszervert úgy konfigurálja, hogy az adatkönyvtár ne legyen közvetlenül kívülről elérhető, vagy az adatkönyvtárt tegye a webszerver dokumentumfáján kívülre.",
 "Setup Warning" => "A beállítással kapcsolatos figyelmeztetés",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "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.",
 "Please double check the <a href='%s'>installation guides</a>." => "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>.",
 "Module 'fileinfo' missing" => "A 'fileinfo' modul hiányzik",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "A 'fileinfo' PHP modul hiányzik. Erősen javasolt ennek a modulnak az telepítése, ha az ember jó eredményt szeretne a MIME-típusok felismerésében.",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "A 'fileinfo' PHP modul hiányzik. Erősen javasolt ennek a modulnak a telepítése a MIME-típusok felismerésének eredményessé tételéhez.",
 "Locale not working" => "A nyelvi lokalizáció nem működik",
 "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." => "Ezen az ownCloud kiszolgálón nem használható a %s nyelvi beállítás. Ez azt jelenti, hogy a fájlnevekben gond lehet bizonyos karakterekkel. Nyomatékosan ajánlott, hogy telepítse a szükséges csomagokat annak érdekében, hogy a rendszer támogassa a %s beállítást.",
 "Internet connection not working" => "Az internet kapcsolat nem működik",
@@ -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",
@@ -102,9 +102,11 @@
 "Login Name" => "Bejelentkezési név",
 "Create" => "Létrehozás",
 "Admin Recovery Password" => "A jelszóvisszaállítás adminisztrációja",
+"Enter the recovery password in order to recover the users files during password change" => "Adja meg az adatok visszanyeréséhez szükséges jelszót arra az esetre, ha a felhasználók megváltoztatják a jelszavukat",
 "Default Storage" => "Alapértelmezett tárhely",
 "Unlimited" => "Korlátlan",
 "Other" => "Más",
+"Username" => "Felhasználónév",
 "Storage" => "Tárhely",
 "change display name" => "a megjelenített név módosítása",
 "set new password" => "új jelszó beállítása",
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index 8d67b45347a72e1b0b6b78d867f00fe8c09a02bf..d6d1c9eb86e102d0d80aa9d71fa1c1dc6440de01 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -21,5 +21,6 @@
 "Language" => "Linguage",
 "Help translate" => "Adjuta a traducer",
 "Create" => "Crear",
-"Other" => "Altere"
+"Other" => "Altere",
+"Username" => "Nomine de usator"
 );
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index fb5ee229f155a49edbdaba65cfdaecf7b29190a6..f2e41221a9f536f9e6099efabc75ab7d706f60ac 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",
@@ -103,6 +103,7 @@
 "Default Storage" => "Penyimpanan Baku",
 "Unlimited" => "Tak terbatas",
 "Other" => "Lainnya",
+"Username" => "Nama pengguna",
 "Storage" => "Penyimpanan",
 "change display name" => "ubah nama tampilan",
 "set new password" => "setel sandi baru",
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index b3172855c149963112d41702037f261e0fe1d662..aa3df8c3c432c99330fb77dcfb031c3d1f6cd6c8 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -15,8 +15,12 @@
 "Unable to remove user from group %s" => "Ekki tókst að fjarlægja notanda úr hópnum %s",
 "Disable" => "Gera óvirkt",
 "Enable" => "Virkja",
+"Please wait...." => "Andartak....",
 "Error" => "Villa",
+"Updating...." => "Uppfæri...",
+"Updated" => "Uppfært",
 "Saving..." => "Er að vista ...",
+"deleted" => "eytt",
 "undo" => "afturkalla",
 "Groups" => "Hópar",
 "Group Admin" => "Hópstjóri",
@@ -47,6 +51,7 @@
 "Current password" => "Núverandi lykilorð",
 "New password" => "Nýtt lykilorð",
 "Change password" => "Breyta lykilorði",
+"Display Name" => "Vísa nafn",
 "Email" => "Netfang",
 "Your email address" => "Netfangið þitt",
 "Fill in an email address to enable password recovery" => "Sláðu inn netfangið þitt til að virkja endurheimt á lykilorði",
@@ -58,6 +63,7 @@
 "Default Storage" => "Sjálfgefin gagnageymsla",
 "Unlimited" => "Ótakmarkað",
 "Other" => "Annað",
+"Username" => "Notendanafn",
 "Storage" => "gagnapláss",
 "Default" => "Sjálfgefið"
 );
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 38c22ea06dea33438664f80f75ae6f825f2eefef..85e78f5a21d10a4e05a2f11386beb57b7d846473 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,9 +102,11 @@
 "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",
+"Username" => "Nome utente",
 "Storage" => "Archiviazione",
 "change display name" => "cambia il nome visualizzato",
 "set new password" => "imposta una nuova password",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index ad42d3f085b90cdeffc0fdc275c7520aafdd8185..1b2562261d68a207d791f0c7803c39805b524a5e 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,9 +102,11 @@
 "Login Name" => "ログイン名",
 "Create" => "作成",
 "Admin Recovery Password" => "管理者復旧パスワード",
+"Enter the recovery password in order to recover the users files during password change" => "パスワード変更の間のユーザーのファイルを回復するために、リカバリパスワードを入力してください",
 "Default Storage" => "デフォルトストレージ",
 "Unlimited" => "無制限",
 "Other" => "その他",
+"Username" => "ユーザー名",
 "Storage" => "ストレージ",
 "change display name" => "表示名を変更",
 "set new password" => "新しいパスワードを設定",
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index f6f4249e68fcff8ef6d3c489fbe3890238780c52..812ad46bd7c2103ee5bf967503104666db9a3522 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" => "თქვენი პაროლი არ შეიცვალა",
@@ -104,6 +104,7 @@
 "Default Storage" => "საწყისი საცავი",
 "Unlimited" => "ულიმიტო",
 "Other" => "სხვა",
+"Username" => "მომხმარებლის სახელი",
 "Storage" => "საცავი",
 "change display name" => "შეცვალე დისფლეის სახელი",
 "set new password" => "დააყენეთ ახალი პაროლი",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index 2a139a025627527c7c5039fbdaef5a4caf3d17cd..de837677eba8dee6c18de1199e1ebd1a20ad768d 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -1,39 +1,76 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "앱 스토어에서 목록을 가져올 수 없습니다",
 "Authentication error" => "인증 오류",
-"Group already exists" => "그룹이 이미 존재합니다.",
-"Unable to add group" => "그룹을 추가할 수 없습니다.",
+"Your display name has been changed." => "표시 이름이 변경되었습니다.",
+"Unable to change display name" => "표시 이름을 변경할 수 없음",
+"Group already exists" => "그룹이 이미 존재함",
+"Unable to add group" => "그룹을 추가할 수 없음",
 "Could not enable app. " => "앱을 활성화할 수 없습니다.",
 "Email saved" => "이메일 저장됨",
 "Invalid email" => "잘못된 이메일 주소",
-"Unable to delete group" => "그룹을 삭제할 수 없습니다.",
-"Unable to delete user" => "사용자를 삭제할 수 없습니다.",
-"Language changed" => "언어가 변경되었습니다",
+"Unable to delete group" => "그룹을 삭제할 수 없음",
+"Unable to delete user" => "사용자를 삭제할 수 없음.",
+"Language changed" => "언어가 변경됨",
 "Invalid request" => "잘못된 요청",
-"Admins can't remove themself from the admin group" => "관리자 자신을 관리자 그룹에서 삭제할 수 없습니다",
-"Unable to add user to group %s" => "그룹 %s에 사용자를 추가할 수 없습니다.",
-"Unable to remove user from group %s" => "그룹 %s에서 사용자를 삭제할 수 없습니다.",
+"Admins can't remove themself from the admin group" => "관리자 자신을 관리자 그룹에서 삭제할 수 없음",
+"Unable to add user to group %s" => "그룹 %s에 사용자를 추가할 수 없음",
+"Unable to remove user from group %s" => "그룹 %s에서 사용자를 삭제할 수 없음",
+"Couldn't update app." => "앱을 업데이트할 수 없습니다.",
+"Update to {appversion}" => "버전 {appversion}(으)로 업데이트",
 "Disable" => "비활성화",
 "Enable" => "사용함",
+"Please wait...." => "기다려 주십시오....",
 "Error" => "오류",
+"Updating...." => "업데이트 중....",
+"Error while updating app" => "앱을 업데이트하는 중 오류 발생",
+"Updated" => "업데이트됨",
 "Saving..." => "저장 중...",
-"deleted" => "삭제",
-"undo" => "되돌리기",
+"deleted" => "삭제됨",
+"undo" => "실행 취소",
+"Unable to remove user" => "사용자를 삭제할 수 없음",
 "Groups" => "그룹",
 "Group Admin" => "그룹 관리자",
 "Delete" => "삭제",
+"add group" => "그룹 추가",
+"A valid username must be provided" => "올바른 사용자 이름을 입력해야 함",
+"Error creating user" => "사용자 생성 오류",
+"A valid password must be provided" => "올바른 암호를 입력해야 함",
 "__language_name__" => "한국어",
 "Security Warning" => "보안 경고",
 "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." => "데이터 디렉터리와 파일을 인터넷에서 접근할 수 있는 것 같습니다. ownCloud에서 제공한 .htaccess 파일이 작동하지 않습니다. 웹 서버를 다시 설정하여 데이터 디렉터리에 접근할 수 없도록 하거나 문서 루트 바깥쪽으로 옮기는 것을 추천합니다.",
 "Setup Warning" => "설정 경고",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAV 인터페이스가 제대로 작동하지 않습니다. 웹 서버에서 파일 동기화를 사용할 수 있도록 설정이 제대로 되지 않은 것 같습니다.",
+"Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오.",
+"Module 'fileinfo' missing" => "모듈 'fileinfo'가 없음",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP 모듈 'fileinfo'가 존재하지 않습니다. MIME 형식 감지 결과를 향상시키기 위하여 이 모듈을 활성화하는 것을 추천합니다.",
+"Locale not working" => "로캘이 작동하지 않음",
+"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." => "ownCloud 서버의 시스템 로캘을 %s(으)로 설정할 수 없습니다. 파일 이름에 특정한 글자가 들어가 있는 경우 문제가 발생할 수 있습니다. %s을(를) 지원하기 위해서 시스템에 필요한 패키지를 설치하는 것을 추천합니다.",
+"Internet connection not working" => "인터넷에 연결할 수 없음",
+"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." => "ownCloud 서버에서 인터넷에 연결할 수 없습니다. 외부 저장소 마운트, 업데이트 알림, 외부 앱 설치 등이 작동하지 않을 것입니다. 외부에서 파일에 접근하거나, 알림 이메일을 보내지 못할 수도 있습니다. ownCloud의 모든 기능을 사용하려면 이 서버를 인터넷에 연결하는 것을 추천합니다.",
 "Cron" => "크론",
+"Execute one task with each page loaded" => "개별 페이지를 불러올 때마다 실행",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php가 webcron 서비스에 등록되어 있습니다. HTTP를 통하여 1분마다 ownCloud 루트에서 cron.php 페이지를 불러옵니다.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "시스템 cron 서비스를 사용합니다. 시스템 cronjob을 사용하여 ownCloud 폴더의 cron.php 파일을 1분마다 불러옵니다.",
+"Sharing" => "공유",
+"Enable Share API" => "공유 API 사용하기",
+"Allow apps to use the Share API" => "앱에서 공유 API를 사용할 수 있도록 허용",
+"Allow links" => "링크 허용",
+"Allow users to share items to the public with links" => "사용자가 개별 항목의 링크를 공유할 수 있도록 허용",
+"Allow resharing" => "재공유 허용",
+"Allow users to share items shared with them again" => "사용자에게 공유된 항목을 다시 공유할 수 있도록 허용",
+"Allow users to share with anyone" => "누구나와 공유할 수 있도록 허용",
+"Allow users to only share with users in their groups" => "사용자가 속해 있는 그룹의 사용자와만 공유할 수 있도록 허용",
+"Security" => "보안",
+"Enforce HTTPS" => "HTTPS 강제 사용",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "클라이언트가 ownCloud에 항상 암호화된 연결로 연결하도록 강제합니다.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "SSL 강제 사용 설정을 변경하려면 ownCloud 인스턴스에 HTTPS로 연결하십시오.",
 "Log" => "로그",
 "Log level" => "로그 단계",
 "More" => "더 중요함",
 "Less" => "덜 중요함",
 "Version" => "버전",
 "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>." => "<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>에 따라 사용이 허가됩니다.",
-"Add your App" => "앱 추가",
+"Add your App" => "내 앱 추가",
 "More Apps" => "더 많은 앱",
 "Select an App" => "앱 선택",
 "See application page at apps.owncloud.com" => "apps.owncloud.com에 있는 앱 페이지를 참고하십시오",
@@ -45,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" => "앱을 이용하여 당신의 파일을 동기화 할 수 있습니다.",
+"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" => "암호를 변경할 수 없음",
@@ -57,16 +94,19 @@
 "Display Name" => "표시 이름",
 "Email" => "이메일",
 "Your email address" => "이메일 주소",
-"Fill in an email address to enable password recovery" => "암호 찾기 기능을 사용하려면 이메일 주소를 입력하십시오.",
+"Fill in an email address to enable password recovery" => "암호 찾기 기능을 사용하려면 이메일 주소를 입력하십시오",
 "Language" => "언어",
 "Help translate" => "번역 돕기",
 "WebDAV" => "WebDAV",
-"Use this address to connect to your ownCloud in your file manager" => "파일 관리자에서 ownCloud에 접속하려면 이 주소를 사용하십시오.",
+"Use this address to connect to your ownCloud in your file manager" => "파일 관리자에서 ownCloud에 접속하려면 이 주소를 사용하십시오",
 "Login Name" => "로그인 이름",
 "Create" => "만들기",
+"Admin Recovery Password" => "관리자 복구 암호",
+"Enter the recovery password in order to recover the users files during password change" => "암호 변경 시 변경된 사용자 파일을 복구하려면 복구 암호를 입력하십시오",
 "Default Storage" => "기본 저장소",
 "Unlimited" => "무제한",
 "Other" => "기타",
+"Username" => "사용자 이름",
 "Storage" => "저장소",
 "change display name" => "표시 이름 변경",
 "set new password" => "새 암호 설정",
diff --git a/settings/l10n/ku_IQ.php b/settings/l10n/ku_IQ.php
index a7d2daa70baca053ec9c94c5bb99d36013bd82a5..244aba63a2c72276b05dbcd1aa7d440f6bf85d84 100644
--- a/settings/l10n/ku_IQ.php
+++ b/settings/l10n/ku_IQ.php
@@ -5,5 +5,6 @@
 "Update" => "نوێکردنه‌وه",
 "Password" => "وشەی تێپەربو",
 "New password" => "وشەی نهێنی نوێ",
-"Email" => "ئیمه‌یل"
+"Email" => "ئیمه‌یل",
+"Username" => "ناوی به‌کارهێنه‌ر"
 );
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index 427e6568a403a43a531df9b03fdf981b247e712e..7060d41537a95d813ba742d6804dda20db85d77b 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -39,5 +39,6 @@
 "Language" => "Sprooch",
 "Help translate" => "Hëllef iwwersetzen",
 "Create" => "Erstellen",
-"Other" => "Aner"
+"Other" => "Aner",
+"Username" => "Benotzernumm"
 );
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index dba1f92017eef18786d64ad69587e2779b8cc81f..eb628a530eb10cb953b03a76853de93c3cd92f25 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -27,6 +27,7 @@
 "Select an App" => "Pasirinkite programÄ…",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>",
 "Update" => "Atnaujinti",
+"Get the apps to sync your files" => "Atsisiųskite programėlių, kad sinchronizuotumėte savo failus",
 "Password" => "Slaptažodis",
 "Your password was changed" => "Jūsų slaptažodis buvo pakeistas",
 "Unable to change your password" => "Neįmanoma pakeisti slaptažodžio",
@@ -39,5 +40,6 @@
 "Language" => "Kalba",
 "Help translate" => "Padėkite išversti",
 "Create" => "Sukurti",
-"Other" => "Kita"
+"Other" => "Kita",
+"Username" => "Prisijungimo vardas"
 );
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index 5864a392ace60adb09e93159e41c31f4d583f894..ae2a3b2838559435deedf037dc5ba58bed5e0813 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",
@@ -103,6 +103,7 @@
 "Default Storage" => "Noklusējuma krātuve",
 "Unlimited" => "Neierobežota",
 "Other" => "Cits",
+"Username" => "Lietotājvārds",
 "Storage" => "Krātuve",
 "change display name" => "mainīt redzamo vārdu",
 "set new password" => "iestatīt jaunu paroli",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 902a8d2d6a798a2d25496e2629ecb8b7380842f5..f42e5b07de20e235cd54a6f5350dabe4036fadc6 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -56,5 +56,6 @@
 "WebDAV" => "WebDAV",
 "Use this address to connect to your ownCloud in your file manager" => "Користете ја оваа адреса да ",
 "Create" => "Создај",
-"Other" => "Останато"
+"Other" => "Останато",
+"Username" => "Корисничко име"
 );
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index a0b94f1a1bd1f94c0a4049bf9a9b80497f072682..d151cba29f94560506ab13d114cbd0ea791378c9 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -31,5 +31,6 @@
 "Language" => "Bahasa",
 "Help translate" => "Bantu terjemah",
 "Create" => "Buat",
-"Other" => "Lain"
+"Other" => "Lain",
+"Username" => "Nama pengguna"
 );
diff --git a/settings/l10n/my_MM.php b/settings/l10n/my_MM.php
index d12c9bcf036db87f8a07fe4274f0f28614de1058..9459a2e53fec7506d16faea3976833a6ac39513e 100644
--- a/settings/l10n/my_MM.php
+++ b/settings/l10n/my_MM.php
@@ -3,5 +3,6 @@
 "Invalid request" => "တောင်းဆိုချက်မမှန်ကန်ပါ",
 "Security Warning" => "လုံခြုံရေးသတိပေးချက်",
 "Password" => "စကားဝှက်",
-"New password" => "စကားဝှက်အသစ်"
+"New password" => "စကားဝှက်အသစ်",
+"Username" => "သုံးစွဲသူအမည်"
 );
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 9f18bf472acddcd98607e77e7ca70bfcb31ee9e7..8b1c577e885594127a1ed35b5dc1dc594d21f938 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",
@@ -104,6 +104,7 @@
 "Default Storage" => "Standard lager",
 "Unlimited" => "Ubegrenset",
 "Other" => "Annet",
+"Username" => "Brukernavn",
 "Storage" => "Lager",
 "change display name" => "endre visningsnavn",
 "set new password" => "sett nytt passord",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 00de9e8b49ac6bda9dd5c27054bb41f5755adf02..40220cbbd2e326690b8932d62be7bb3259b41884 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>" => "U heeft <strong>%s</strong> van de <strong>%s</strong>  beschikbaren gebruikt",
-"Get the apps to sync your files" => "Download de apps om bestanden te synchen",
+"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",
@@ -94,7 +94,7 @@
 "Display Name" => "Weergavenaam",
 "Email" => "E-mailadres",
 "Your email address" => "Uw e-mailadres",
-"Fill in an email address to enable password recovery" => "Vul een e-mailadres in om wachtwoord reset uit te kunnen voeren",
+"Fill in an email address to enable password recovery" => "Vul een mailadres in om je wachtwoord te kunnen herstellen",
 "Language" => "Taal",
 "Help translate" => "Help met vertalen",
 "WebDAV" => "WebDAV",
@@ -102,11 +102,13 @@
 "Login Name" => "Inlognaam",
 "Create" => "Creëer",
 "Admin Recovery Password" => "Beheer herstel wachtwoord",
-"Default Storage" => "Default opslag",
+"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",
-"Storage" => "Opslag",
+"Username" => "Gebruikersnaam",
+"Storage" => "Opslaglimiet",
 "change display name" => "wijzig weergavenaam",
 "set new password" => "Instellen nieuw wachtwoord",
-"Default" => "Default"
+"Default" => "Standaard"
 );
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 3008873c861c750ed7db5a7bccf76fb2de2d143c..4ec8d51db6837b1af0c4a430a72f4a8418334e90 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",
@@ -104,6 +104,7 @@
 "Default Storage" => "Standardlagring",
 "Unlimited" => "Ubegrensa",
 "Other" => "Anna",
+"Username" => "Brukarnamn",
 "Storage" => "Lagring",
 "change display name" => "endra visingsnamn",
 "set new password" => "lag nytt passord",
diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php
index 052974591a2a06b9b85302e60950715749646567..34820d0349d2dd3d187f7777141e9d0cf825c16d 100644
--- a/settings/l10n/oc.php
+++ b/settings/l10n/oc.php
@@ -46,5 +46,6 @@
 "Language" => "Lenga",
 "Help translate" => "Ajuda a la revirada",
 "Create" => "Crea",
-"Other" => "Autres"
+"Other" => "Autres",
+"Username" => "Non d'usancièr"
 );
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 908a930339d928cafb8fe38953efe715ae9f8b9e..4fea6b68ca9b4f54fe927730afeab51c94dc252a 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",
@@ -102,9 +102,11 @@
 "Login Name" => "Login",
 "Create" => "Utwórz",
 "Admin Recovery Password" => "Odzyskiwanie hasła administratora",
+"Enter the recovery password in order to recover the users files during password change" => "Wpisz hasło odzyskiwania, aby odzyskać pliki użytkowników podczas zmiany hasła",
 "Default Storage" => "Magazyn domyślny",
 "Unlimited" => "Bez limitu",
 "Other" => "Inne",
+"Username" => "Nazwa użytkownika",
 "Storage" => "Magazyn",
 "change display name" => "zmień wyświetlaną nazwę",
 "set new password" => "ustaw nowe hasło",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 824940da583d89e75504ad98237ccc9275fcd618..48cc6200b3b2ebfbfdd6fc228db20a09b83481f3 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,9 +102,11 @@
 "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",
+"Username" => "Nome de Usuário",
 "Storage" => "Armazenamento",
 "change display name" => "alterar nome de exibição",
 "set new password" => "definir nova senha",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index c5fc1a009267ef74ac74893148f7d3ac3c9c7a6e..7a54ca74ba7d5e25dd2eb934954348f746607a7d 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,9 +102,11 @@
 "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",
+"Username" => "Nome de utilizador",
 "Storage" => "Armazenamento",
 "change display name" => "modificar nome exibido",
 "set new password" => "definir nova palavra-passe",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index f48e0bae0ad65af3548015943549a5dc554017fe..48f18070f3fc067dbe5d570f5eb8e4f6a95b932f 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",
@@ -75,6 +75,7 @@
 "Default Storage" => "Stocare implicită",
 "Unlimited" => "Nelimitată",
 "Other" => "Altele",
+"Username" => "Nume utilizator",
 "Storage" => "Stocare",
 "Default" => "Implicită"
 );
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index e10e022e8e5108ef49eca172426249f4a219fa36..df616008fa4f24635b1945dd46ec4417688e9b4a 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" => "Невозможно сменить пароль",
@@ -101,9 +101,12 @@
 "Use this address to connect to your ownCloud in your file manager" => "Используйте этот URL для подключения файлового менеджера к Вашему хранилищу",
 "Login Name" => "Имя пользователя",
 "Create" => "Создать",
+"Admin Recovery Password" => "Восстановление Пароля Администратора",
+"Enter the recovery password in order to recover the users files during password change" => "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля",
 "Default Storage" => "Хранилище по-умолчанию",
 "Unlimited" => "Неограниченно",
 "Other" => "Другое",
+"Username" => "Имя пользователя",
 "Storage" => "Хранилище",
 "change display name" => "изменить отображаемое имя",
 "set new password" => "установить новый пароль",
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index 4303b14c37ec2e6e3167821aa25b088f6ca25041..5fa1eaf5f43cc2f86c5d7169799f796cf13f387e 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -47,5 +47,6 @@
 "Language" => "භාෂාව",
 "Help translate" => "පරිවර්ථන සහය",
 "Create" => "තනන්න",
-"Other" => "වෙනත්"
+"Other" => "වෙනත්",
+"Username" => "පරිශීලක නම"
 );
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 5d8445b4b3b85fc9462d26c6e40df25101c44926..9164cbd9b0ae57585342d572e0cb082e6aa31b95 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",
@@ -102,9 +102,11 @@
 "Login Name" => "Prihlasovacie meno",
 "Create" => "Vytvoriť",
 "Admin Recovery Password" => "Obnovenie hesla administrátora",
+"Enter the recovery password in order to recover the users files during password change" => "Zadajte heslo pre obnovenie súborov používateľa pri zmene hesla",
 "Default Storage" => "Predvolené úložisko",
 "Unlimited" => "Nelimitované",
 "Other" => "Iné",
+"Username" => "Meno používateľa",
 "Storage" => "Úložisko",
 "change display name" => "zmeniť zobrazované meno",
 "set new password" => "nastaviť nové heslo",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 55d957cfa7d3e6e5f8cfc3b09e652078396c48ab..21c10abf0fe41a1a95f8b97b4e5b4e1a5251dfeb 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.",
@@ -104,6 +104,7 @@
 "Default Storage" => "Privzeta shramba",
 "Unlimited" => "Neomejeno",
 "Other" => "Drugo",
+"Username" => "Uporabniško ime",
 "Storage" => "Shramba",
 "change display name" => "spremeni prikazano ime",
 "set new password" => "nastavi novo geslo",
diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php
index 03db0cd8fcd4fba4f2c2514082be3366cfe9be0f..c81e58e2fa09280fda68306c3292171862329dcc 100644
--- a/settings/l10n/sq.php
+++ b/settings/l10n/sq.php
@@ -10,5 +10,6 @@
 "Get the apps to sync your files" => "Merrni app-et për sinkronizimin e skedarëve tuaj",
 "Password" => "Kodi",
 "New password" => "Kodi i ri",
-"Email" => "Email-i"
+"Email" => "Email-i",
+"Username" => "Përdoruesi"
 );
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index 29e0661e44361d588a33d46a48605a3c7e000bff..2b95ddcad43e9abc55139a10a7787670f06ce5c1 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" => "Не могу да изменим вашу лозинку",
@@ -97,6 +97,7 @@
 "Default Storage" => "Подразумевано складиште",
 "Unlimited" => "Неограничено",
 "Other" => "Друго",
+"Username" => "Корисничко име",
 "Storage" => "Складиште",
 "change display name" => "промени име за приказ",
 "set new password" => "постави нову лозинку",
diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
index 96190507d5312f6b1f11b9ccc74d5560d3037f5d..8e375a7f23c064099ee67bc1fd6cc0c57e9b2cac 100644
--- a/settings/l10n/sr@latin.php
+++ b/settings/l10n/sr@latin.php
@@ -13,5 +13,6 @@
 "Email" => "E-mail",
 "Language" => "Jezik",
 "Create" => "Napravi",
-"Other" => "Drugo"
+"Other" => "Drugo",
+"Username" => "Korisničko ime"
 );
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index db4f63d22197bf8cac1f5e595a528ecff70af2a9..8773fe0dc1df9b2804d14e08d91d03c54bf852cc 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Kan inte ladda listan från App Store",
 "Authentication error" => "Fel vid autentisering",
+"Your display name has been changed." => "Ditt visningsnamn har ändrats.",
 "Unable to change display name" => "Kan inte ändra visningsnamn",
 "Group already exists" => "Gruppen finns redan",
 "Unable to add group" => "Kan inte lägga till grupp",
@@ -14,8 +15,8 @@
 "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",
-"Update to {appversion}" => "Uppdaterar till {appversion}",
+"Couldn't update app." => "Kunde inte uppdatera appen.",
+"Update to {appversion}" => "Uppdatera till {appversion}",
 "Disable" => "Deaktivera",
 "Enable" => "Aktivera",
 "Please wait...." => "Var god vänta...",
@@ -42,6 +43,10 @@
 "Please double check the <a href='%s'>installation guides</a>." => "Var god kontrollera <a href='%s'>installationsguiden</a>.",
 "Module 'fileinfo' missing" => "Modulen \"fileinfo\" saknas",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-modulen 'fileinfo' saknas. Vi rekommenderar starkt att aktivera den här modulen för att kunna upptäcka korrekt mime-typ.",
+"Locale not working" => "Locale fungerar inte",
+"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." => "Denna ownCloud server kan inte sätta system locale till %s. Det innebär att det kan vara problem med vissa tecken i filnamnet. Vi vill verkligen rekommendera att du installerar nödvändiga paket på ditt system för att stödja %s.",
+"Internet connection not working" => "Internetförbindelsen fungerar inte",
+"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." => "Den här ownCloudservern har ingen fungerande internetförbindelse. Det innebär att några funktioner som t.ex. att montera externa lagringsplatser, meddelanden om uppdateringar eller installation av tredjepartsappar inte fungerar. Det kan vara så att det inte går att få fjärråtkomst till filer och att e-post inte fungerar. Vi rekommenderar att du tillåter internetåtkomst för den här servern om du vill ha tillgång till alla funktioner hos ownCloud",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Exekvera en uppgift vid varje sidladdning",
 "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php är registrerad som en webcron-tjänst. Anropa cron.php sidan i ownCloud en gång i minuten över HTTP.",
@@ -56,12 +61,15 @@
 "Allow users to share with anyone" => "Tillåt delning med alla",
 "Allow users to only share with users in their groups" => "Tillåt bara delning med användare i egna grupper",
 "Security" => "Säkerhet",
+"Enforce HTTPS" => "Kräv HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Tvingar klienter att ansluta till ownCloud via en krypterad förbindelse.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Vänligen anslut till denna instans av ownCloud via HTTPS för att aktivera/avaktivera SSL",
 "Log" => "Logg",
 "Log level" => "Nivå på loggning",
 "More" => "Mer",
 "Less" => "Mindre",
 "Version" => "Version",
-"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>." => "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kommunity</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>.",
+"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>." => "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>.",
 "Add your App" => "Lägg till din applikation",
 "More Apps" => "Fler Appar",
 "Select an App" => "Välj en App",
@@ -69,21 +77,21 @@
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensierad av <span class=\"author\"></span>",
 "Update" => "Uppdatera",
 "User Documentation" => "Användardokumentation",
-"Administrator Documentation" => "Administratördokumentation",
+"Administrator Documentation" => "Administratörsdokumentation",
 "Online Documentation" => "Onlinedokumentation",
 "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 appar för att synkronisera dina filer",
+"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",
 "Current password" => "Nuvarande lösenord",
 "New password" => "Nytt lösenord",
 "Change password" => "Ändra lösenord",
-"Display Name" => "Visat namn",
+"Display Name" => "Visningsnamn",
 "Email" => "E-post",
 "Your email address" => "Din e-postadress",
 "Fill in an email address to enable password recovery" => "Fyll i en e-postadress för att aktivera återställning av lösenord",
@@ -93,11 +101,14 @@
 "Use this address to connect to your ownCloud in your file manager" => "Använd denna adress för att ansluta till ownCloud i din filhanterare",
 "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",
+"Username" => "Användarnamn",
 "Storage" => "Lagring",
-"change display name" => "ändra visat namn",
+"change display name" => "ändra visningsnamn",
 "set new password" => "ange nytt lösenord",
 "Default" => "Förvald"
 );
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
index 052bb823655caa4a2c1eb775c1a5eac9e913336c..64e9cb85aa7ed03a3d0a0f35145b3884246c3de2 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -45,5 +45,6 @@
 "Language" => "மொழி",
 "Help translate" => "மொழிபெயர்க்க உதவி",
 "Create" => "உருவாக்குக",
-"Other" => "மற்றவை"
+"Other" => "மற்றவை",
+"Username" => "பயனாளர் பெயர்"
 );
diff --git a/settings/l10n/te.php b/settings/l10n/te.php
index 8bce394ddfac3f19aa6227af29c9f249ffd9238a..0e619282e8ff7c1297da77f2f97907332b608b44 100644
--- a/settings/l10n/te.php
+++ b/settings/l10n/te.php
@@ -5,5 +5,6 @@
 "Password" => "సంకేతపదం",
 "New password" => "కొత్త సంకేతపదం",
 "Your email address" => "మీ ఈమెయిలు చిరునామా",
-"Language" => "భాష"
+"Language" => "భాష",
+"Username" => "వాడుకరి పేరు"
 );
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 998e457778591b616e80d774f13aad9c741c0be0..7221cd734829fd669b571f4e16e449ce1597607f 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" => "ไม่สามารถเปลี่ยนรหัสผ่านของคุณได้",
@@ -83,6 +83,7 @@
 "Default Storage" => "พื้นที่จำกัดข้อมูลเริ่มต้น",
 "Unlimited" => "ไม่จำกัดจำนวน",
 "Other" => "อื่นๆ",
+"Username" => "ชื่อผู้ใช้งาน",
 "Storage" => "พื้นที่จัดเก็บข้อมูล",
 "change display name" => "เปลี่ยนชื่อที่ต้องการให้แสดง",
 "set new password" => "ตั้งค่ารหัสผ่านใหม่",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 0a803d64ec0643951133a70e75f30fa1100b7807..ef7b797ef60098873b53cc5db12f266aaf13a8f5 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",
@@ -101,9 +101,11 @@
 "Use this address to connect to your ownCloud in your file manager" => "Bu adresi kullanarak ownCloud 'unuza dosya yöneticinizde bağlanın",
 "Login Name" => "Giriş Adı",
 "Create" => "OluÅŸtur",
+"Admin Recovery Password" => "Yönetici kurtarma parolası",
 "Default Storage" => "Varsayılan Depolama",
 "Unlimited" => "Limitsiz",
 "Other" => "DiÄŸer",
+"Username" => "Kullanıcı Adı",
 "Storage" => "Depolama",
 "change display name" => "ekran adını değiştir",
 "set new password" => "yeni parola belirle",
diff --git a/settings/l10n/ug.php b/settings/l10n/ug.php
index 8e8c17f0d363a38963adce7c5b7acd6558bfb5d3..abed87ef0d419443c9b1989dec2e689d1b92a3ba 100644
--- a/settings/l10n/ug.php
+++ b/settings/l10n/ug.php
@@ -64,6 +64,7 @@
 "Default Storage" => "كۆڭۈلدىكى ساقلىغۇچ",
 "Unlimited" => "چەكسىز",
 "Other" => "باشقا",
+"Username" => "ئىشلەتكۈچى ئاتى",
 "Storage" => "ساقلىغۇچ",
 "change display name" => "كۆرسىتىدىغان ئىسىمنى ئۆزگەرت",
 "set new password" => "يېڭى ئىم تەڭشە",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index d2b51e853f2963710926748a25fc4040d2da4bb9..1de01ec6a0d0123c0c22f12c8a4fe3f0953aa2d1 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" => "Не вдалося змінити Ваш пароль",
@@ -103,6 +103,7 @@
 "Default Storage" => "сховище за замовчуванням",
 "Unlimited" => "Необмежено",
 "Other" => "Інше",
+"Username" => "Ім'я користувача",
 "Storage" => "Сховище",
 "change display name" => "змінити зображене ім'я",
 "set new password" => "встановити новий пароль",
diff --git a/settings/l10n/ur_PK.php b/settings/l10n/ur_PK.php
index 02bcb0573271b25e3b1161049ad1defc7e90b922..ce1d425c9703ca19b532c34a8b9a34e4a6e35052 100644
--- a/settings/l10n/ur_PK.php
+++ b/settings/l10n/ur_PK.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Error" => "ایرر",
 "Password" => "پاسورڈ",
-"New password" => "نیا پاسورڈ"
+"New password" => "نیا پاسورڈ",
+"Username" => "یوزر نیم"
 );
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index c9f7cd8633db30a4aa32a034f13ccce8ef1dd5ae..7eb5df0edf146bcb43e424cb34ad1aae3a035791 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",
@@ -84,6 +84,7 @@
 "Default Storage" => "Bộ nhớ mặc định",
 "Unlimited" => "Không giới hạn",
 "Other" => "Khác",
+"Username" => "Tên đăng nhập",
 "Storage" => "Bá»™ nhá»›",
 "change display name" => "Thay đổi tên hiển thị",
 "set new password" => "đặt mật khẩu mới",
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
index e2f59e72d0fc6a7489a3c8353004a9528d2bc7c5..0457de48a229c188fb8233d886c49a466aa2350a 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "不能从App Store 中加载列表",
 "Authentication error" => "验证错误",
+"Your display name has been changed." => "您的显示名称已修改",
 "Unable to change display name" => "无法更改显示名称",
 "Group already exists" => "群组已存在",
 "Unable to add group" => "未能添加群组",
@@ -40,7 +41,10 @@
 "Setup Warning" => "配置注意",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "因WebDAV接口故障，您的网络服务器好像并未允许文件同步。",
 "Please double check the <a href='%s'>installation guides</a>." => "请双击<a href='%s'>安装向导</a>。",
+"Module 'fileinfo' missing" => "模块“fileinfo”丢失。",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP 模块“fileinfo”丢失。我们强烈建议打开此模块来获得 mine 类型检测的最佳结果。",
 "Locale not working" => "区域设置未运作",
+"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." => "ownCloud 服务器不能把系统区域设置到 %s。这意味着文件名可内可能含有某些引起问题的字符。我们强烈建议在您的系统上安装必要的包来支持“%s”。",
 "Internet connection not working" => "互联网连接未运作",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "在每个页面载入时执行一项任务",
@@ -75,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" => "不能改变你的密码",
@@ -97,6 +101,7 @@
 "Default Storage" => "默认容量",
 "Unlimited" => "无限制",
 "Other" => "其他",
+"Username" => "用户名",
 "Storage" => "容量",
 "change display name" => "更改显示名称",
 "set new password" => "设置新的密码",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 1ec0b004c60d84ac985460979de533a1b8b21ed1..7669b922b619683b4093bf1d76b0853d2848a157 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" => "无法修改密码",
@@ -101,9 +101,11 @@
 "Use this address to connect to your ownCloud in your file manager" => "用该地址来连接文件管理器中的 ownCloud",
 "Login Name" => "登录名称",
 "Create" => "创建",
+"Admin Recovery Password" => "管理恢复密码",
 "Default Storage" => "默认存储",
 "Unlimited" => "无限",
 "Other" => "其它",
+"Username" => "用户名",
 "Storage" => "存储",
 "change display name" => "修改显示名称",
 "set new password" => "设置新密码",
diff --git a/settings/l10n/zh_HK.php b/settings/l10n/zh_HK.php
index 843a41c9c103fb02f5848388334cc234ac4aca63..8da974627517e40a7cf227d628884a6548eb8cdf 100644
--- a/settings/l10n/zh_HK.php
+++ b/settings/l10n/zh_HK.php
@@ -4,5 +4,6 @@
 "Delete" => "刪除",
 "Password" => "密碼",
 "New password" => "新密碼",
-"Email" => "電郵"
+"Email" => "電郵",
+"Username" => "用戶名稱"
 );
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index aca20f15e5c2dc8f6f3a705e30563ff0d2c09d72..0d3ff7414bb4cff64db9339e10c028f89a45a63e 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" => "無法變更您的密碼",
@@ -105,6 +105,7 @@
 "Default Storage" => "預設儲存區",
 "Unlimited" => "無限制",
 "Other" => "其他",
+"Username" => "使用者名稱",
 "Storage" => "儲存區",
 "change display name" => "修改顯示名稱",
 "set new password" => "設定新密碼",
diff --git a/settings/personal.php b/settings/personal.php
index cab6e56dada3a43c1ccc19cec6e57b90d3fbf959..cb411cacc5b218f5c6877cf0c35028a642873af6 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 28254b7aa1844a5c5d9ebbb8cb51f3ca9c6314a6..1ed3f6ef47fffbd5b900af9e889286a19e4e5d0b 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 d3639cbab34915ad1690a3fd7c5ff5d84ef89f08..0903b9bd5c429988f4516278e0e688e5776a232b 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 f0002c505c801a13fe51d2497e35a5fbab52f479..a9457399d5dc8004fb76c52a3837b0115b410699 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 a6df85983dd6c52e7ac67c10ae93c3fce7bb0c11..9fcc11ab89a4bf680d170ec54eb1d2605935fa1a 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">
@@ -77,7 +81,7 @@ $_['subadmingroups'] = array_flip($items);
 <table class="hascontrols" data-groups="<?php p(implode(', ', $allGroups));?>">
 	<thead>
 		<tr>
-			<th id='headerName'><?php p($l->t('Login Name'))?></th>
+			<th id='headerName'><?php p($l->t('Username'))?></th>
 			<th id="headerDisplayName"><?php p($l->t( 'Display Name' )); ?></th>
 			<th id="headerPassword"><?php p($l->t( 'Password' )); ?></th>
 			<th id="headerGroups"><?php p($l->t( 'Groups' )); ?></th>
diff --git a/status.php b/status.php
index 9d6ac87c671a3069f5acaa72abf003c04273c07d..bac01c11b288bc9dd58161d8e808b8c9380db490 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 af2e5ce3439131671ca96378d8cfb1e9e97d02a1..8f6dc5e2ecd539b9571ec8a66da28563c97208e7 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 c1bbb550483076a1b0b89ffc7f5d753e48a92ef7..fc6fe0bba7d513d14e997fc97631f3bc85d6a79b 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 440f3fb6bfd5be3ca5a98726834eb6e6509eb0f6..afbdb413c3d7e61e64adcad3b7a2588d8cf98c6a 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 e20a04ef7fd06fe9d64e55b8de3e7feab9c7e413..59f203993efc8d845993182c1ed1e9932c8ef64f 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/cache.php b/tests/lib/files/cache/cache.php
index f272655925b6633fdf7a4226f9f70140e8001c63..527c1d1b2a13c84092ab68175393dedb7b5f4698 100644
--- a/tests/lib/files/cache/cache.php
+++ b/tests/lib/files/cache/cache.php
@@ -348,7 +348,9 @@ class Cache extends \PHPUnit_Framework_TestCase {
 	}
 
 	public function tearDown() {
-		$this->cache->clear();
+		if ($this->cache) {
+			$this->cache->clear();
+		}
 	}
 
 	public function setUp() {
diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php
index 3885c99e6d325121c260547c39ea1cfa02995531..042bf8991f6f7f4d01b13068acbdaf0265de0dd2 100644
--- a/tests/lib/files/cache/scanner.php
+++ b/tests/lib/files/cache/scanner.php
@@ -104,7 +104,7 @@ class Scanner extends \PHPUnit_Framework_TestCase {
 		$this->assertNotEquals($cachedDataFolder['size'], -1);
 	}
 
-	function testBackgroundScan(){
+	function testBackgroundScan() {
 		$this->fillTestFolders();
 		$this->storage->mkdir('folder2');
 		$this->storage->file_put_contents('folder2/bar.txt', 'foobar');
@@ -126,6 +126,45 @@ class Scanner extends \PHPUnit_Framework_TestCase {
 		$this->assertFalse($this->cache->getIncomplete());
 	}
 
+	public function testReuseExisting() {
+		$this->fillTestFolders();
+
+		$this->scanner->scan('');
+		$oldData = $this->cache->get('');
+		$this->storage->unlink('folder/bar.txt');
+		$this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_SIZE);
+		$newData = $this->cache->get('');
+		$this->assertNotEquals($oldData['etag'], $newData['etag']);
+		$this->assertEquals($oldData['size'], $newData['size']);
+
+		$oldData = $newData;
+		$this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW, \OC\Files\Cache\Scanner::REUSE_ETAG);
+		$newData = $this->cache->get('');
+		$this->assertEquals($oldData['etag'], $newData['etag']);
+		$this->assertEquals(-1, $newData['size']);
+	}
+
+	public function testRemovedFile() {
+		$this->fillTestFolders();
+
+		$this->scanner->scan('');
+		$this->assertTrue($this->cache->inCache('foo.txt'));
+		$this->storage->unlink('foo.txt');
+		$this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW);
+		$this->assertFalse($this->cache->inCache('foo.txt'));
+	}
+
+	public function testRemovedFolder() {
+		$this->fillTestFolders();
+
+		$this->scanner->scan('');
+		$this->assertTrue($this->cache->inCache('folder/bar.txt'));
+		$this->storage->unlink('/folder');
+		$this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW);
+		$this->assertFalse($this->cache->inCache('folder'));
+		$this->assertFalse($this->cache->inCache('folder/bar.txt'));
+	}
+
 	function setUp() {
 		$this->storage = new \OC\Files\Storage\Temporary(array());
 		$this->scanner = new \OC\Files\Cache\Scanner($this->storage);
@@ -133,9 +172,11 @@ class Scanner extends \PHPUnit_Framework_TestCase {
 	}
 
 	function tearDown() {
-		$ids = $this->cache->getAll();
-		$permissionsCache = $this->storage->getPermissionsCache();
-		$permissionsCache->removeMultiple($ids, \OC_User::getUser());
-		$this->cache->clear();
+		if ($this->cache) {
+			$ids = $this->cache->getAll();
+			$permissionsCache = $this->storage->getPermissionsCache();
+			$permissionsCache->removeMultiple($ids, \OC_User::getUser());
+			$this->cache->clear();
+		}
 	}
 }
diff --git a/tests/lib/files/cache/updater.php b/tests/lib/files/cache/updater.php
index dad3cd7e6503cf671375fd1049bc8b7cc3e3f9fa..b2db27e42e0ea52431207f38bdc0ef8664b2a940 100644
--- a/tests/lib/files/cache/updater.php
+++ b/tests/lib/files/cache/updater.php
@@ -56,7 +56,7 @@ class Updater extends \PHPUnit_Framework_TestCase {
 		\OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Updater', 'writeHook');
 		\OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Updater', 'deleteHook');
 		\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook');
-
+		\OC_Hook::connect('OC_Filesystem', 'post_touch', '\OC\Files\Cache\Updater', 'touchHook');
 	}
 
 	public function tearDown() {
@@ -69,6 +69,7 @@ class Updater extends \PHPUnit_Framework_TestCase {
 	public function testWrite() {
 		$textSize = strlen("dummy file data\n");
 		$imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo.png');
+		$this->cache->put('foo.txt', array('mtime' => 100));
 		$rootCachedData = $this->cache->get('');
 		$this->assertEquals(3 * $textSize + $imageSize, $rootCachedData['size']);
 
@@ -77,11 +78,9 @@ class Updater extends \PHPUnit_Framework_TestCase {
 		$cachedData = $this->cache->get('foo.txt');
 		$this->assertEquals(3, $cachedData['size']);
 		$this->assertNotEquals($fooCachedData['etag'], $cachedData['etag']);
-		$mtime = $cachedData['mtime'];
 		$cachedData = $this->cache->get('');
 		$this->assertEquals(2 * $textSize + $imageSize + 3, $cachedData['size']);
 		$this->assertNotEquals($rootCachedData['etag'], $cachedData['etag']);
-		$this->assertGreaterThanOrEqual($rootCachedData['mtime'], $mtime);
 		$rootCachedData = $cachedData;
 
 		$this->assertFalse($this->cache->inCache('bar.txt'));
@@ -96,6 +95,27 @@ class Updater extends \PHPUnit_Framework_TestCase {
 		$this->assertGreaterThanOrEqual($rootCachedData['mtime'], $mtime);
 	}
 
+	public function testWriteWithMountPoints() {
+		$storage2 = new \OC\Files\Storage\Temporary(array());
+		$cache2 = $storage2->getCache();
+		Filesystem::mount($storage2, array(), '/' . self::$user . '/files/folder/substorage');
+		$folderCachedData = $this->cache->get('folder');
+		$substorageCachedData = $cache2->get('');
+		Filesystem::file_put_contents('folder/substorage/foo.txt', 'asd');
+		$this->assertTrue($cache2->inCache('foo.txt'));
+		$cachedData = $cache2->get('foo.txt');
+		$this->assertEquals(3, $cachedData['size']);
+		$mtime = $cachedData['mtime'];
+
+		$cachedData = $cache2->get('');
+		$this->assertNotEquals($substorageCachedData['etag'], $cachedData['etag']);
+		$this->assertEquals($mtime, $cachedData['mtime']);
+
+		$cachedData = $this->cache->get('folder');
+		$this->assertNotEquals($folderCachedData['etag'], $cachedData['etag']);
+		$this->assertEquals($mtime, $cachedData['mtime']);
+	}
+
 	public function testDelete() {
 		$textSize = strlen("dummy file data\n");
 		$imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo.png');
@@ -103,7 +123,7 @@ class Updater extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals(3 * $textSize + $imageSize, $rootCachedData['size']);
 
 		$this->assertTrue($this->cache->inCache('foo.txt'));
-		Filesystem::unlink('foo.txt', 'asd');
+		Filesystem::unlink('foo.txt');
 		$this->assertFalse($this->cache->inCache('foo.txt'));
 		$cachedData = $this->cache->get('');
 		$this->assertEquals(2 * $textSize + $imageSize, $cachedData['size']);
@@ -123,6 +143,26 @@ class Updater extends \PHPUnit_Framework_TestCase {
 		$this->assertGreaterThanOrEqual($rootCachedData['mtime'], $cachedData['mtime']);
 	}
 
+	public function testDeleteWithMountPoints() {
+		$storage2 = new \OC\Files\Storage\Temporary(array());
+		$cache2 = $storage2->getCache();
+		Filesystem::mount($storage2, array(), '/' . self::$user . '/files/folder/substorage');
+		Filesystem::file_put_contents('folder/substorage/foo.txt', 'asd');
+		$this->assertTrue($cache2->inCache('foo.txt'));
+		$folderCachedData = $this->cache->get('folder');
+		$substorageCachedData = $cache2->get('');
+		Filesystem::unlink('folder/substorage/foo.txt');
+		$this->assertFalse($cache2->inCache('foo.txt'));
+
+		$cachedData = $cache2->get('');
+		$this->assertNotEquals($substorageCachedData['etag'], $cachedData['etag']);
+		$this->assertGreaterThanOrEqual($substorageCachedData['mtime'], $cachedData['mtime']);
+
+		$cachedData = $this->cache->get('folder');
+		$this->assertNotEquals($folderCachedData['etag'], $cachedData['etag']);
+		$this->assertGreaterThanOrEqual($folderCachedData['mtime'], $cachedData['mtime']);
+	}
+
 	public function testRename() {
 		$textSize = strlen("dummy file data\n");
 		$imageSize = filesize(\OC::$SERVERROOT . '/core/img/logo.png');
@@ -142,4 +182,85 @@ class Updater extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals(3 * $textSize + $imageSize, $cachedData['size']);
 		$this->assertNotEquals($rootCachedData['etag'], $cachedData['etag']);
 	}
+
+	public function testRenameWithMountPoints() {
+		$storage2 = new \OC\Files\Storage\Temporary(array());
+		$cache2 = $storage2->getCache();
+		Filesystem::mount($storage2, array(), '/' . self::$user . '/files/folder/substorage');
+		Filesystem::file_put_contents('folder/substorage/foo.txt', 'asd');
+		$this->assertTrue($cache2->inCache('foo.txt'));
+		$folderCachedData = $this->cache->get('folder');
+		$substorageCachedData = $cache2->get('');
+		$fooCachedData = $cache2->get('foo.txt');
+		Filesystem::rename('folder/substorage/foo.txt', 'folder/substorage/bar.txt');
+		$this->assertFalse($cache2->inCache('foo.txt'));
+		$this->assertTrue($cache2->inCache('bar.txt'));
+		$cachedData = $cache2->get('bar.txt');
+		$this->assertEquals($fooCachedData['fileid'], $cachedData['fileid']);
+		$mtime = $cachedData['mtime'];
+
+		$cachedData = $cache2->get('');
+		$this->assertNotEquals($substorageCachedData['etag'], $cachedData['etag']);
+		$this->assertEquals($mtime, $cachedData['mtime']);
+
+		$cachedData = $this->cache->get('folder');
+		$this->assertNotEquals($folderCachedData['etag'], $cachedData['etag']);
+		$this->assertEquals($mtime, $cachedData['mtime']);
+	}
+
+	public function testTouch() {
+		$rootCachedData = $this->cache->get('');
+		$fooCachedData = $this->cache->get('foo.txt');
+		Filesystem::touch('foo.txt');
+		$cachedData = $this->cache->get('foo.txt');
+		$this->assertNotEquals($fooCachedData['etag'], $cachedData['etag']);
+		$this->assertGreaterThanOrEqual($fooCachedData['mtime'], $cachedData['mtime']);
+
+		$cachedData = $this->cache->get('');
+		$this->assertNotEquals($rootCachedData['etag'], $cachedData['etag']);
+		$this->assertGreaterThanOrEqual($rootCachedData['mtime'], $cachedData['mtime']);
+		$rootCachedData = $cachedData;
+
+		$time = 1371006070;
+		$barCachedData = $this->cache->get('folder/bar.txt');
+		$folderCachedData = $this->cache->get('folder');
+		Filesystem::touch('folder/bar.txt', $time);
+		$cachedData = $this->cache->get('folder/bar.txt');
+		$this->assertNotEquals($barCachedData['etag'], $cachedData['etag']);
+		$this->assertEquals($time, $cachedData['mtime']);
+
+		$cachedData = $this->cache->get('folder');
+		$this->assertNotEquals($folderCachedData['etag'], $cachedData['etag']);
+		$this->assertEquals($time, $cachedData['mtime']);
+
+		$cachedData = $this->cache->get('');
+		$this->assertNotEquals($rootCachedData['etag'], $cachedData['etag']);
+		$this->assertEquals($time, $cachedData['mtime']);
+	}
+
+	public function testTouchWithMountPoints() {
+		$storage2 = new \OC\Files\Storage\Temporary(array());
+		$cache2 = $storage2->getCache();
+		Filesystem::mount($storage2, array(), '/' . self::$user . '/files/folder/substorage');
+		Filesystem::file_put_contents('folder/substorage/foo.txt', 'asd');
+		$this->assertTrue($cache2->inCache('foo.txt'));
+		$folderCachedData = $this->cache->get('folder');
+		$substorageCachedData = $cache2->get('');
+		$fooCachedData = $cache2->get('foo.txt');
+		$cachedData = $cache2->get('foo.txt');
+		$time = 1371006070;
+		Filesystem::touch('folder/substorage/foo.txt', $time);
+		$cachedData = $cache2->get('foo.txt');
+		$this->assertNotEquals($fooCachedData['etag'], $cachedData['etag']);
+		$this->assertEquals($time, $cachedData['mtime']);
+
+		$cachedData = $cache2->get('');
+		$this->assertNotEquals($substorageCachedData['etag'], $cachedData['etag']);
+		$this->assertEquals($time, $cachedData['mtime']);
+
+		$cachedData = $this->cache->get('folder');
+		$this->assertNotEquals($folderCachedData['etag'], $cachedData['etag']);
+		$this->assertEquals($time, $cachedData['mtime']);
+	}
+
 }
diff --git a/tests/lib/files/cache/watcher.php b/tests/lib/files/cache/watcher.php
index e43c86ed4387636347dcb5e0a74acbd1bbb20ecb..749b1ab75a301408fd597f4ffe29174038a7015e 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 e3859bc0f2333213e041acd899ecd1069992dab2..48ae95b7e72286ffdcd08a83c33b973135c406d2 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 01f9a9cca11966aeab52320319a31112131c8d9a..830913a91ad991161d4cebcce871b63504fadca9 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 82e6160868770c250134f10dbcf78d2da1ce15a0..2c3611c092e022ac97fad556f456b3152a269b5b 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 336e8f8b3c5ccf90bec70aa37efb644d188e118a..6acb0dfaa6b1cf1a2eb8b2e7f5e1079e7a089d58 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 577e1f0d490c2918842bfedb3743a85443e47713..23b2d6c0060f293df7de59ce17f587d7182c2324 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>
@@ -13,13 +18,19 @@
 				<directory suffix=".php">../3rdparty</directory>
 				<directory suffix=".php">../apps/files/l10n</directory>
 				<directory suffix=".php">../apps/files_external/l10n</directory>
+				<directory suffix=".php">../apps/files_external/3rdparty</directory>
 				<directory suffix=".php">../apps/files_versions/l10n</directory>
 				<directory suffix=".php">../apps/files_encryption/l10n</directory>
+				<directory suffix=".php">../apps/files_encryption/3rdparty</directory>
 				<directory suffix=".php">../apps/files_sharing/l10n</directory>
 				<directory suffix=".php">../apps/files_trashbin/l10n</directory>
 				<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>